kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

json: Make it obvious that ast_json_unref() is NULL safe.

Browse Source 
It looked like the safety check was done after the NULL pointer was used.
........

Merged revisions 399576 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-21 00:17:56 +00:00
parent 6cc3084ae7
commit 120abb5ecd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/json.c
View File

@@ -213,13 +213,15 @@ void ast_json_unref(struct ast_json *json)
struct json_mem_list *free_list; struct json_mem_list *free_list;
struct json_mem *mem; struct json_mem *mem;
if (!json) {
return;
}
/* Jansson refcounting is non-atomic; lock it. */ /* Jansson refcounting is non-atomic; lock it. */
{ {
SCOPED_JSON_LOCK(json); SCOPED_JSON_LOCK(json);
if (!json) {
return; json_decref((json_t *) json);
}
json_decref((json_t *)json);
} }
/* Now free any objects that were ast_json_free()'s while the lock was /* Now free any objects that were ast_json_free()'s while the lock was