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

Merge pull request #392 from besser82/json-c-0.13

Browse Source 
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
This commit is contained in:
Eric Haszlakiewicz
2017-12-14 17:25:53 -05:00
committed by GitHub
parent b5a3eff582 3e89278476
commit eb55c83600
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I autoconf-archive/m4
EXTRA_DIST = README.md README.html EXTRA_DIST = README.md README.html
EXTRA_DIST += config.h.win32 EXTRA_DIST += config.h.win32
EXTRA_DIST += Doxyfile EXTRA_DIST += Doxyfile

5
json_object.c
View File

@@ -182,6 +182,11 @@ int json_object_put(struct json_object *jso)
{ {
if(!jso) return 0; if(!jso) return 0;
/* Avoid invalid free and crash explicitly instead of (silently)
* segfaulting.
*/
assert(jso->_ref_count > 0);
#if defined(HAVE_ATOMIC_BUILTINS) && defined(ENABLE_THREADING) #if defined(HAVE_ATOMIC_BUILTINS) && defined(ENABLE_THREADING)
/* Note: this only allow the refcount to remain correct /* Note: this only allow the refcount to remain correct
* when multiple threads are adjusting it. It is still an error * when multiple threads are adjusting it. It is still an error