database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Fix "path" infrastructure bug affecting jsonb_set()

Browse Source 
jsonb_set() and other clients of the setPathArray() utility function
could get spurious results when an array integer subscript is provided
that is not within the range of int.

To fix, ensure that the value returned by strtol() within setPathArray()
is within the range of int;  when it isn't, assume an invalid input in
line with existing, similar cases.  The path-orientated operators that
appeared in PostgreSQL 9.3 and 9.4 do not call setPathArray(), and
already independently take this precaution, so no change there.

Peter Geoghegan
This commit is contained in:
Andrew Dunstan
2015-06-12 19:26:03 -04:00
parent ae58f1430a
commit 2271d002d5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/utils/adt/jsonfuncs.c
View File

@ -3814,11 +3814,14 @@ setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
if (level < path_len && !path_nulls[level])
{
char *c = VARDATA_ANY(path_elems[level]);
long lindex;
errno = 0;
idx = (int) strtol(c, &badp, 10);
if (errno != 0 || badp == c)
lindex = strtol(c, &badp, 10);
if (errno != 0 || badp == c || lindex > INT_MAX || lindex < INT_MIN)
idx = nelems;
else
idx = lindex;
}
else
idx = nelems;