From a13f8868e83673345fc75931e423d14555b99f58 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut
Date: Fri, 25 Sep 2009 21:13:06 +0000
Subject: Prevent isolated second surrogate in U& syntax

---
 src/backend/parser/scan.l | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 0b8d5f7cd8..1557a300ab 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -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
-- 
cgit v1.2.3