Fix detection of unfinished Unicode surrogate pair at end of string.

tglsfdc · tglsfdc · commit a8ae12322ae0 · 2016-12-21T17:39:32.000-05:00
The U&'...' and U&"..." syntaxes silently discarded a surrogate pair start (that is, a code between U+D800 and U+DBFF) if it occurred at the very end of the string. This seems like an obvious oversight, since we throw an error for every other invalid combination of surrogate characters, including the very same situation in E'...' syntax. This has been wrong since the pair processing was added (in 9.0), so back-patch to all supported branches. Discussion: https://postgr.es/m/19113.1482337898@sss.pgh.pa.us
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
@@ -1435,6 +1435,13 @@ litbuf_udeescape(unsigned char escape, core_yyscan_t yyscanner)
 		}
 	}
 
+	/* unfinished surrogate pair? */
+	if (pair_first)
+	{
+		ADVANCE_YYLLOC(in - litbuf + 3);				/* 3 for U&" */
+		yyerror("invalid Unicode surrogate pair");
+	}
+
 	*out = '\0';
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -1435,6 +1435,13 @@ litbuf_udeescape(unsigned char escape, core_yyscan_t yyscanner)`
`1435`	`1435`	`}`
`1436`	`1436`	`}`
`1437`	`1437`
	`1438`	`+ /* unfinished surrogate pair? */`
	`1439`	`+ if (pair_first)`
	`1440`	`+ {`
	`1441`	`+ ADVANCE_YYLLOC(in - litbuf + 3); /* 3 for U&" */`
	`1442`	`+ yyerror("invalid Unicode surrogate pair");`
	`1443`	`+ }`
	`1444`	`+`
`1438`	`1445`	`*out = '\0';`
`1439`	`1446`
`1440`	`1447`	`/*`