NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3899caf

committed

Fix broken definition for function name in pgbench's exprscan.l.

As written, this would accept e.g. 123e9 as a function name. Asidefrom being mildly astonishing, that would come back to haunt us ifwe ever try to add float constants to the expression syntax. Insistthat function names start with letters (or at least non-digits).In passing reset yyline as well as yycol when starting a new expression.This variable is useless since it's used nowhere, but if we're goingto have it we should have it act sanely.

1 parentfd45d16 commit3899cafCopy full SHA for 3899caf

File tree

1 file changed

-5

lines changed

src/bin/pgbench
- exprscan.l

1 file changed

-5

lines changed

`‎src/bin/pgbench/exprscan.l`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ static int expr_col = 0;`
`35`	`35`	`%optionwarn`
`36`	`36`	`%optionprefix="expr_yy"`
`37`	`37`
	`38`	`+alpha[a-zA-Z_]`
	`39`	`+digit[0-9]`
	`40`	`+alnum[a-zA-Z0-9_]`
`38`	`41`	`space[\t\r\f]`
`39`	`42`
`40`	`43`	`%%`
`@@ -48,17 +51,17 @@ space[ \t\r\f]`
`48`	`51`	`")"{ yycol += yyleng;return')'; }`
`49`	`52`	`","{ yycol += yyleng;return','; }`
`50`	`53`
`51`		`-:[a-zA-Z0-9_]+{`
	`54`	`+:{alnum}+{`
`52`	`55`	`yycol += yyleng;`
`53`	`56`	`yylval.str =pg_strdup(yytext +1);`
`54`	`57`	`return VARIABLE;`
`55`	`58`	`}`
`56`		`-[0-9]+{`
	`59`	`+{digit}+{`
`57`	`60`	`yycol += yyleng;`
`58`	`61`	`yylval.ival =strtoint64(yytext);`
`59`	`62`	`return INTEGER;`
`60`	`63`	`}`
`61`		`-[a-zA-Z0-9_]+{`
	`64`	`+{alpha}{alnum}+{`
`62`	`65`	`yycol += yyleng;`
`63`	`66`	`yylval.str =pg_strdup(yytext);`
`64`	`67`	`return FUNCTION;`
`@@ -107,8 +110,8 @@ expr_scanner_init(const char str, const char source,`
`107`	`110`	`expr_command = (char *) cmd;`
`108`	`111`	`expr_col = (int) ecol;`
`109`	`112`
`110`		`-/* resetcolumn count for this scan */`
`111`		`-yycol =0;`
	`113`	`+/* reseterror pointers for this scan */`
	`114`	`+yycol =yyline =0;`
`112`	`115`
`113`	`116`	`/*`
`114`	`117`	`* Might be left over after error`

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!

Commit3899caf

File tree

1 file changed

1 file changed

`‎src/bin/pgbench/exprscan.l`

0 commit comments