rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect logic in JSON number lexer 

Detectable by gcc -Wlogical-op.

Add two regression test cases that would previously allow incorrect
values to pass.
This commit is contained in:
Peter Eisentraut 2012-05-20 02:24:46 +03:00
parent fe2534e534
commit f1f6737e15
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/adt/json.c
View File

@ -541,7 +541,7 @@ json_lex_number(JsonLexContext *lex, char *s)
if (*s == '.')
{
++s;
if (*s < '0' && *s > '9')
if (*s < '0' || *s > '9')
error = true;
else
{
@ -558,7 +558,7 @@ json_lex_number(JsonLexContext *lex, char *s)
++s;
if (*s == '+' || *s == '-')
++s;
if (*s < '0' && *s > '9')
if (*s < '0' || *s > '9')
error = true;
else
{

10
src/test/regress/expected/json.out
View File

@ -113,6 +113,16 @@ ERROR: invalid input syntax for type json
LINE 1: SELECT '1f2'::json;
^
DETAIL: line 1: Token "1f2" is invalid.
SELECT '0.x1'::json; -- ERROR
ERROR: invalid input syntax for type json
LINE 1: SELECT '0.x1'::json;
^
DETAIL: line 1: Token "0.x1" is invalid.
SELECT '1.3ex100'::json; -- ERROR
ERROR: invalid input syntax for type json
LINE 1: SELECT '1.3ex100'::json;
^
DETAIL: line 1: Token "1.3ex100" is invalid.
-- Arrays.
SELECT '[]'::json; -- OK
json

2
src/test/regress/sql/json.sql
View File

@ -22,6 +22,8 @@ SELECT '9223372036854775808'::json; -- OK, even though it's too large for int8
SELECT '1e100'::json; -- OK
SELECT '1.3e100'::json; -- OK
SELECT '1f2'::json; -- ERROR
SELECT '0.x1'::json; -- ERROR
SELECT '1.3ex100'::json; -- ERROR
-- Arrays.
SELECT '[]'::json; -- OK