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

Handle NULL objects in json_object_get_userdata() by returning NULL, but abort in json_object_set_userdata() since we can't actually do anything with the userdata.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2016-10-29 15:42:36 -04:00
parent f8132f932d
commit d4899bd4d5
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

@@ -241,12 +241,15 @@ enum json_type json_object_get_type(const struct json_object *jso)
} }
void* json_object_get_userdata(json_object *jso) { void* json_object_get_userdata(json_object *jso) {
return jso->_userdata; return jso ? jso->_userdata : NULL;
} }
void json_object_set_userdata(json_object *jso, void *userdata, void json_object_set_userdata(json_object *jso, void *userdata,
json_object_delete_fn *user_delete) json_object_delete_fn *user_delete)
{ {
// Can't return failure, so abort if we can't perform the operation.
assert(jso != NULL);
// First, clean up any previously existing user info // First, clean up any previously existing user info
if (jso->_user_delete) if (jso->_user_delete)
jso->_user_delete(jso, jso->_userdata); jso->_user_delete(jso, jso->_userdata);