diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-13 14:24:58 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-13 14:24:58 -0500 |
| commit | a8a46d846c13d1ed07ad0a900e37dd318c8096e2 (patch) | |
| tree | 4b2b15130fbcd42dfc9568dc7494a3da1ad27025 | |
| parent | 42ec6a832348f168eb94443d168bdb2f62fe1794 (diff) | |
| download | postgresql-a8a46d846c13d1ed07ad0a900e37dd318c8096e2.tar.gz postgresql-a8a46d846c13d1ed07ad0a900e37dd318c8096e2.zip | |
Fix length checking for Unicode identifiers containing escapes (U&"...").
We used the length of the input string, not the de-escaped string, as
the trigger for NAMEDATALEN truncation. AFAICS this would only result
in sometimes printing a phony truncation warning; but it's just luck
that there was no worse problem, since we were violating the API spec
for truncate_identifier(). Per bug #9204 from Joshua Yanovski.
This has been wrong since the Unicode-identifier support was added,
so back-patch to all supported branches.
| -rw-r--r-- | src/backend/parser/scan.l | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 6e18a41db1e..f8c18689f84 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -620,28 +620,32 @@ other . return IDENT; } <xui>{xuistop1} { - char *ident; + char *ident; + int identlen; BEGIN(INITIAL); if (literallen == 0) yyerror("zero-length delimited identifier"); ident = litbuf_udeescape('\\'); - if (literallen >= NAMEDATALEN) - truncate_identifier(ident, literallen, true); + identlen = strlen(ident); + if (identlen >= NAMEDATALEN) + truncate_identifier(ident, identlen, true); yylval.str = ident; /* throw back all but the quote */ yyless(1); return IDENT; } <xui>{xuistop2} { - char *ident; + char *ident; + int identlen; BEGIN(INITIAL); if (literallen == 0) yyerror("zero-length delimited identifier"); ident = litbuf_udeescape(yytext[yyleng - 2]); - if (literallen >= NAMEDATALEN) - truncate_identifier(ident, literallen, true); + identlen = strlen(ident); + if (identlen >= NAMEDATALEN) + truncate_identifier(ident, identlen, true); yylval.str = ident; return IDENT; } |