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

Revert bogus change to json_object_get() made in f40b08d8 that caused it to always return NULL. (Issue #259)

Browse Source 
Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi
 try to set flags on a NULL pointer, and doing so should not be silently
 ignored.
This commit is contained in:
Eric Haszlakiewicz
2016-08-11 17:03:16 -04:00
parent 0ad87649d4
commit 4d62de3898
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json_object.c
View File

@@ -172,7 +172,7 @@ extern struct json_object* json_object_get(struct json_object *jso)
{ {
if (jso) if (jso)
jso->_ref_count++; jso->_ref_count++;
return NULL; return jso;
} }
int json_object_put(struct json_object *jso) int json_object_put(struct json_object *jso)

2
json_tokener.c
View File

@@ -979,5 +979,5 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
void json_tokener_set_flags(struct json_tokener *tok, int flags) void json_tokener_set_flags(struct json_tokener *tok, int flags)
{ {
if(tok) tok->flags = flags; tok->flags = flags;
} }