diff options
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | 2012-01-29 15:49:48 -0800 |
|---|---|---|
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | 2012-01-29 15:49:48 -0800 |
| commit | faa535386a0c0a984caa4cc522d0cf70c97bc68f (patch) | |
| tree | f46b8f17318ee3debc89793ea92fa01c0871943d | |
| parent | 393085a4ba5738b128f9f52de4d6871ec8713372 (diff) | |
| parent | db050901fac07c9e46e0e606fc6ac2a6dc032560 (diff) | |
| download | json-c-faa535386a0c0a984caa4cc522d0cf70c97bc68f.tar.gz | |
Merge pull request #11 from deweerdt/master
json_tokener_parse(): avoid possible NULL deref
| -rw-r--r-- | json_tokener.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/json_tokener.c b/json_tokener.c index df106b1..1921de6 100644 --- a/json_tokener.c +++ b/json_tokener.c @@ -113,6 +113,8 @@ struct json_object* json_tokener_parse(const char *str) struct json_object* obj; tok = json_tokener_new(); + if (!tok) + return NULL; obj = json_tokener_parse_ex(tok, str, -1); if(tok->err != json_tokener_success) obj = NULL; |