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

Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2012-10-18 17:14:41 -05:00
parent 5f4739e2eb
commit 5450bed051
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
json_object.c
View File

@@ -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* 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); json_object_object_get_ex(jso, key, &result);
return result; return result;
} }
json_bool json_object_object_get_ex(struct json_object* jso, const char *key, struct json_object **value) 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; if (NULL == jso) return FALSE;
switch(jso->o_type) { switch(jso->o_type) {