diff options
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | 2016-08-11 17:03:16 -0400 |
|---|---|---|
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | 2016-08-11 17:05:41 -0400 |
| commit | 4d62de38982d3110f3ab5998fc99b4b50f00ebb7 (patch) | |
| tree | f94ea28d139336f36c5bb9bb761f521005871782 /json_tokener.c | |
| parent | 0ad87649d43215b8fdd198329c4acb1fd220b6e9 (diff) | |
| download | json-c-4d62de38982d3110f3ab5998fc99b4b50f00ebb7.tar.gz | |
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.
Diffstat (limited to 'json_tokener.c')
| -rw-r--r-- | json_tokener.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |