From: Tom Lane Date: Wed, 21 Dec 2016 22:39:32 +0000 (-0500) Subject: Fix detection of unfinished Unicode surrogate pair at end of string. X-Git-Tag: REL_10_BETA1~1214 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8ae12322ae056ebbe9d83cf16b4c92e86a6ac28;p=postgresql Fix detection of unfinished Unicode surrogate pair at end of string. 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 index 998349d742..acd9269805 100644 --- 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'; /*