NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit148052d

committed

Fix length checking for Unicode identifiers containing escapes (U&"...").

We used the length of the input string, not the de-escaped string, asthe trigger for NAMEDATALEN truncation. AFAICS this would only resultin sometimes printing a phony truncation warning; but it's just luckthat there was no worse problem, since we were violating the API specfor 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.

1 parent16b06c9 commit148052dCopy full SHA for 148052d

File tree

1 file changed

+10

-6

lines changed

src/backend/parser
- scan.l

1 file changed

+10

-6

lines changed

`‎src/backend/parser/scan.l`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -696,28 +696,32 @@ other.`
`696`	`696`	`return IDENT;`
`697`	`697`	`}`
`698`	`698`	`<xui>{xuistop1}{`
`699`		`-char *ident;`
	`699`	`+char *ident;`
	`700`	`+intidentlen;`
`700`	`701`
`701`	`702`	`BEGIN(INITIAL);`
`702`	`703`	`if (yyextra->literallen ==0)`
`703`	`704`	`yyerror("zero-length delimited identifier");`
`704`	`705`	`ident =litbuf_udeescape('\\', yyscanner);`
`705`		`-if (yyextra->literallen >= NAMEDATALEN)`
`706`		`-truncate_identifier(ident, yyextra->literallen,true);`
	`706`	`+identlen =strlen(ident);`
	`707`	`+if (identlen >= NAMEDATALEN)`
	`708`	`+truncate_identifier(ident, identlen,true);`
`707`	`709`	`yylval->str = ident;`
`708`	`710`	`/* throw back all but the quote */`
`709`	`711`	`yyless(1);`
`710`	`712`	`return IDENT;`
`711`	`713`	`}`
`712`	`714`	`<xui>{xuistop2}{`
`713`		`-char *ident;`
	`715`	`+char *ident;`
	`716`	`+intidentlen;`
`714`	`717`
`715`	`718`	`BEGIN(INITIAL);`
`716`	`719`	`if (yyextra->literallen ==0)`
`717`	`720`	`yyerror("zero-length delimited identifier");`
`718`	`721`	`ident =litbuf_udeescape(yytext[yyleng -2], yyscanner);`
`719`		`-if (yyextra->literallen >= NAMEDATALEN)`
`720`		`-truncate_identifier(ident, yyextra->literallen,true);`
	`722`	`+identlen =strlen(ident);`
	`723`	`+if (identlen >= NAMEDATALEN)`
	`724`	`+truncate_identifier(ident, identlen,true);`
`721`	`725`	`yylval->str = ident;`
`722`	`726`	`return IDENT;`
`723`	`727`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit148052d

File tree

1 file changed

1 file changed

`‎src/backend/parser/scan.l`

0 commit comments