mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 08:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #936 from dxbjavid/put-free-outside-assert

Browse Source 
free objects outside assert() in json_object_put
This commit is contained in:
Eric Hawicz
2026-07-04 11:20:48 -04:00
committed by GitHub
parent 3aa996b5b6 f291fa81c6
commit e00697585b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json_object.c
+6 -1
View File
@@ -436,11 +436,16 @@ int json_object_put(struct json_object *jso)
// All slots are cleared, now pop back up to the parent // All slots are cleared, now pop back up to the parent
{ {
json_object *parent = jso->_delete_parent; json_object *parent = jso->_delete_parent;
int rc;
// jso is a child that's already been detached from its parent // jso is a child that's already been detached from its parent
// so we need to actually free it now // so we need to actually free it now
assert(jso->_ref_count == 0); assert(jso->_ref_count == 0);
jso->_ref_count++; // We're the exclusive owner of jso, non-atomic add is ok. jso->_ref_count++; // We're the exclusive owner of jso, non-atomic add is ok.
assert(_json_object_put_maybe_free(jso, 1) == 0); // Note: the call must not be inside assert(), or it gets
// compiled out when NDEBUG is defined and the memory leaks.
rc = _json_object_put_maybe_free(jso, 1);
assert(rc == 0);
(void)rc;
jso = parent; jso = parent;
// iteration will be reset at the top of the loop // iteration will be reset at the top of the loop
} }