Issue #934: Also set _userdata=NULL in _json_object_maybe_free() so json_object_put...

Update the test_deep_nesting test output.

diff --git a/json_object.c b/json_object.c
index 71cd25b2a6a9d510156856a5aa9ae1c967a08436..095b84e2b4ab5c0e49b0071d1a84c665fdacaf44 100644 (file)
--- a/json_object.c
+++ b/json_object.c
@@ -304,6 +304,8 @@ static inline int _json_object_put_maybe_free(struct json_object *jso, int free_
        if (jso->_user_delete)
                jso->_user_delete(jso, jso->_userdata);
        jso->_user_delete = NULL;
+       jso->_userdata = NULL; // aka _delete_parent, but json_object_put() will
+                              // have already grabbed it if it needs it.
 
        switch (jso->o_type)
        {
@@ -435,10 +437,11 @@ int json_object_put(struct json_object *jso)
 
                // All slots are cleared, now pop back up to the parent
                {
-                       json_object *parent = jso->_delete_parent;
-                       int rc;
                        // jso is a child that's already been detached from its parent
                        // so we need to actually free it now
+                       // Be sure to grab _delete_parent *before* freeing jso.
+                       json_object *parent = jso->_delete_parent;
+                       int rc;
                        assert(jso->_ref_count == 0);
                        jso->_ref_count++;   // We're the exclusive owner of jso, non-atomic add is ok.
                        // Note: the call must not be inside assert(), or it gets

diff --git a/tests/test_deep_nesting.expected b/tests/test_deep_nesting.expected
index b869cfaabe79953555c86c33cad6b010fb04f9a3..b9c1ab98480f8da2a0ff417db5d291adb9d4ecee 100644 (file)
--- a/tests/test_deep_nesting.expected
+++ b/tests/test_deep_nesting.expected
@@ -1,2 +1,3 @@
 Parsed depth 100000 string to json_object: yes
 Freed json_object
+in user_delete, userdata_val=1