diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-13 14:24:42 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-13 14:24:42 -0500 |
| commit | 44c216330201126d12e466442c667a8e091decd3 (patch) | |
| tree | 8cbec27ba26c699faebcb8580665ffea44cdefe4 /src | |
| parent | 3f735ae831d3c249378280050b104ff751dfc668 (diff) | |
| download | postgresql-44c216330201126d12e466442c667a8e091decd3.tar.gz postgresql-44c216330201126d12e466442c667a8e091decd3.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.
Diffstat (limited to 'src')
| -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 e102e7c81e8..146ae3db2d6 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -737,7 +737,8 @@ other . <xuiend>{xustop1} | <xuiend><<EOF>> { /* no UESCAPE after the quote, throw back everything */ - char *ident; + char *ident; + int identlen; yyless(0); @@ -745,14 +746,16 @@ other . if (yyextra->literallen == 0) yyerror("zero-length delimited identifier"); ident = litbuf_udeescape('\\', yyscanner); - if (yyextra->literallen >= NAMEDATALEN) - truncate_identifier(ident, yyextra->literallen, true); + identlen = strlen(ident); + if (identlen >= NAMEDATALEN) + truncate_identifier(ident, identlen, true); yylval->str = ident; return IDENT; } <xuiend>{xustop2} { /* found UESCAPE after the end quote */ - char *ident; + char *ident; + int identlen; BEGIN(INITIAL); if (yyextra->literallen == 0) @@ -764,8 +767,9 @@ other . yyerror("invalid Unicode escape character"); } ident = litbuf_udeescape(yytext[yyleng - 2], yyscanner); - if (yyextra->literallen >= NAMEDATALEN) - truncate_identifier(ident, yyextra->literallen, true); + identlen = strlen(ident); + if (identlen >= NAMEDATALEN) + truncate_identifier(ident, identlen, true); yylval->str = ident; return IDENT; } |