From 5450bed05147c5d80e3c8c7f79d893d4a22dae4e Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Thu, 18 Oct 2012 17:14:41 -0500 Subject: [PATCH] Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. --- json_object.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/json_object.c b/json_object.c index bb344af..4c179ab 100644 --- a/json_object.c +++ b/json_object.c @@ -390,13 +390,16 @@ void json_object_object_add(struct json_object* jso, const char *key, struct json_object* json_object_object_get(struct json_object* jso, const char *key) { - struct json_object *result; + struct json_object *result = NULL; json_object_object_get_ex(jso, key, &result); return result; } json_bool json_object_object_get_ex(struct json_object* jso, const char *key, struct json_object **value) { + if (value != NULL) + *value = NULL; + if (NULL == jso) return FALSE; switch(jso->o_type) {