Merge pull request #346 from schwehr/get_int

Clamp double to int32 when narrowing in json_object_get_int.
json-c · Aug 22, 2017 · 256ebcd · 256ebcd
2 parents 474376f + ef7b08c
commit 256ebcd
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/json_object.c b/json_object.c
@@ -635,6 +635,10 @@ int32_t json_object_get_int(const struct json_object *jso)
 		return INT32_MAX;
 	return (int32_t) cint64;
   case json_type_double:
+    if (jso->o.c_double <= INT32_MIN)
+      return INT32_MIN;
+    if (jso->o.c_double >= INT32_MAX)
+      return INT32_MAX;
     return (int32_t)jso->o.c_double;
   case json_type_boolean:
     return jso->o.c_boolean;