mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-31 02:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix stack buffer overflow in json_object_double_to_json_string_format()

Browse Source 
Issue originally found in the json-c 0.11 internal copy in GDAL but also found
in latest git version.

If doing things like
json_object* obj = json_object_new_double(1e300);
json_object_set_serializer(obj, json_object_double_to_json_string, "%f", NULL);
json_object_to_json_string(obj)

    size = snprintf(buf, sizeof(buf),
        format ? format :
          (modf(jso->o.c_double, &dummy) == 0) ? "%.17g.0" : "%.17g",
          jso->o.c_double);
will return a value greater than 128 since at least 300 characters are needed.
This value is then passed to printbuf_memappend(pb, buf, size); that tries to
read size bytes in buf.

So we should clamp size to sizeof(buf). And on Windows, _snprintf() returns -1
in that situation, so deal also with this case.

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1682
Credit to OSS-Fuzz
This commit is contained in:
Even Rouault
2017-05-18 22:36:35 +02:00
parent 6bd86d1044
commit 2c2deb87f8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json_object.c
View File

@@ -717,6 +717,8 @@ static int json_object_double_to_json_string_format(struct json_object* jso,
format ? format : format ? format :
(modf(jso->o.c_double, &dummy) == 0) ? "%.17g.0" : "%.17g", (modf(jso->o.c_double, &dummy) == 0) ? "%.17g.0" : "%.17g",
jso->o.c_double); jso->o.c_double);
if(size < 0 || size >= (int)sizeof(buf))
size = (int)sizeof(buf);
p = strchr(buf, ','); p = strchr(buf, ',');
if (p) { if (p) {