From 4d62de38982d3110f3ab5998fc99b4b50f00ebb7 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Thu, 11 Aug 2016 17:03:16 -0400 Subject: [PATCH] Revert bogus change to json_object_get() made in f40b08d8 that caused it to always return NULL. (Issue #259) 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. --- json_object.c | 2 +- json_tokener.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/json_object.c b/json_object.c index c928400..ecfdc32 100644 --- a/json_object.c +++ b/json_object.c @@ -172,7 +172,7 @@ extern struct json_object* json_object_get(struct json_object *jso) { if (jso) jso->_ref_count++; - return NULL; + return jso; } int json_object_put(struct json_object *jso) diff --git a/json_tokener.c b/json_tokener.c index b5a5818..af4804d 100644 --- a/json_tokener.c +++ b/json_tokener.c @@ -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) { - if(tok) tok->flags = flags; + tok->flags = flags; }