From d39a84a6120ac46c9ca3ac362f01844dd3db6ca4 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 25 Sep 2009 21:13:06 +0000 Subject: [PATCH] Prevent isolated second surrogate in U& syntax --- src/backend/parser/scan.l | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 70b595a6fa7..fdc95135509 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -24,7 +24,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.160 2009/09/25 20:51:37 petere Exp $ + * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.161 2009/09/25 21:13:06 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1223,6 +1223,9 @@ litbuf_udeescape(unsigned char escape, base_yyscan_t yyscanner) yyerror("invalid Unicode surrogate pair"); } } + else if (is_utf16_surrogate_second(unicode)) + yyerror("invalid Unicode surrogate pair"); + if (is_utf16_surrogate_first(unicode)) pair_first = unicode; else @@ -1253,6 +1256,9 @@ litbuf_udeescape(unsigned char escape, base_yyscan_t yyscanner) yyerror("invalid Unicode surrogate pair"); } } + else if (is_utf16_surrogate_second(unicode)) + yyerror("invalid Unicode surrogate pair"); + if (is_utf16_surrogate_first(unicode)) pair_first = unicode; else