Use local helper for identifier case rewrite in varlena

c2main · c2main · commit cb1b0df816c0 · 2026-03-10T09:49:04.000Z
The previous revision used two in-place copy patterns after
identifier_case_transform(): strncpy() in one path and memcpy()+NUL
termination in another. Keeping both patterns makes behavior easier to
drift and harder to review.

Introduce a varlena-local helper for this rewrite path, keep
identifier_case_transform() unchanged for other callers, and centralize
the post-transform copy and cleanup in one place.
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -143,6 +143,7 @@ static char *text_position_next_internal(char *start_ptr, TextPositionState *sta
 static char *text_position_get_match_ptr(TextPositionState *state);
 static int	text_position_get_match_pos(TextPositionState *state);
 static void text_position_cleanup(TextPositionState *state);
+static void identifier_case_transform_cstring(char *ident);
 static void check_collation_set(Oid collid);
 static int	text_cmp(text *arg1, text *arg2, Oid collid);
 static void appendStringInfoText(StringInfo str, const text *t);
@@ -2753,6 +2754,18 @@ textToQualifiedNameList(text *textval)
 	return result;
 }
 
+static void
+identifier_case_transform_cstring(char *ident)
+{
+	size_t	len = strlen(ident);
+	char   *new_name;
+
+	new_name = identifier_case_transform(ident, len);
+	Assert(strlen(new_name) == len);
+	strcpy(ident, new_name);
+	pfree(new_name);
+}
+
 /*
  * SplitIdentifierString --- parse a string containing identifiers
  *
@@ -2871,11 +2884,7 @@ SplitIdentifierString(char *rawstring, char separator,
 		if (compatible_db == ORA_PARSER && enable_case_switch
 			 && identifier_case_switch == INTERCHANGE && need_case_switch)
 		{
-			char	   *new_name;
-
-			new_name = identifier_case_transform(curname, strlen(curname));
-			strncpy(curname, new_name, strlen(curname));
-			pfree(new_name);
+			identifier_case_transform_cstring(curname);
 		}
 
 		/* Truncate name if it's overlength */
@@ -3218,12 +3227,7 @@ SplitGUCList(char *rawstring, char separator,
 		if (compatible_db == ORA_PARSER && enable_case_switch
 			 && identifier_case_switch == INTERCHANGE && need_case_switch)
 		{
-			char	   *new_name;
-
-			new_name = identifier_case_transform(curname, strlen(curname));
-			memcpy(curname, new_name, strlen(new_name));
-			curname[strlen(new_name)] = '\0';
-			pfree(new_name);
+			identifier_case_transform_cstring(curname);
 		}
 
 		/*
