Commitf1f6737

committed

Fix incorrect logic in JSON number lexer

Detectable by gcc -Wlogical-op.Add two regression test cases that would previously allow incorrectvalues to pass.

1 parentfe2534e commitf1f6737Copy full SHA for f1f6737

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ json_lex_number(JsonLexContext lex, char s)`
`541`	`541`	`if (*s=='.')`
`542`	`542`	`{`
`543`	`543`	`++s;`
`544`		`-if (s<'0'&&s>'9')`
	`544`	`+if (s<'0'\|\|s>'9')`
`545`	`545`	`error= true;`
`546`	`546`	`else`
`547`	`547`	`{`
`@@ -558,7 +558,7 @@ json_lex_number(JsonLexContext lex, char s)`
`558`	`558`	`++s;`
`559`	`559`	`if (s=='+'\|\|s=='-')`
`560`	`560`	`++s;`
`561`		`-if (s<'0'&&s>'9')`
	`561`	`+if (s<'0'\|\|s>'9')`
`562`	`562`	`error= true;`
`563`	`563`	`else`
`564`	`564`	`{`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,16 @@ ERROR: invalid input syntax for type json`
`113`	`113`	`LINE 1: SELECT '1f2'::json;`
`114`	`114`	`^`
`115`	`115`	`DETAIL: line 1: Token "1f2" is invalid.`
	`116`	`+SELECT '0.x1'::json;-- ERROR`
	`117`	`+ERROR: invalid input syntax for type json`
	`118`	`+LINE 1: SELECT '0.x1'::json;`
	`119`	`+ ^`
	`120`	`+DETAIL: line 1: Token "0.x1" is invalid.`
	`121`	`+SELECT '1.3ex100'::json;-- ERROR`
	`122`	`+ERROR: invalid input syntax for type json`
	`123`	`+LINE 1: SELECT '1.3ex100'::json;`
	`124`	`+ ^`
	`125`	`+DETAIL: line 1: Token "1.3ex100" is invalid.`
`116`	`126`	`-- Arrays.`
`117`	`127`	`SELECT '[]'::json;-- OK`
`118`	`128`	`json`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ SELECT '9223372036854775808'::json;-- OK, even though it's too large for int8`
`22`	`22`	`SELECT'1e100'::json;-- OK`
`23`	`23`	`SELECT'1.3e100'::json;-- OK`
`24`	`24`	`SELECT'1f2'::json;-- ERROR`
	`25`	`+SELECT'0.x1'::json;-- ERROR`
	`26`	`+SELECT'1.3ex100'::json;-- ERROR`
`25`	`27`
`26`	`28`	`-- Arrays.`
`27`	`29`	`SELECT'[]'::json;-- OK`

Comments

(0)