Properly INCREF/DECREF objects pushed on the reader stack

python-rapidjson · Aug 23, 2017 · 4493938 · 4493938
1 parent a628ac3
commit 4493938
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/rapidjson.cpp b/rapidjson.cpp
@@ -285,21 +285,22 @@ struct PyHandler {
         HandlerContext ctx;
         ctx.isObject = true;
         ctx.object = mapping;
+        Py_INCREF(mapping);
 
         stack.push_back(ctx);
 
         return true;
     }
 
     bool EndObject(SizeType member_count) {
+        PyObject* mapping = stack.back().object;
+        stack.pop_back();
+
         if (objectHook == NULL && decoderEndObject == NULL) {
-            stack.pop_back();
+            Py_DECREF(mapping);
             return true;
         }
 
-        PyObject* mapping = stack.back().object;
-        stack.pop_back();
-
         PyObject* replacement;
         if (decoderEndObject != NULL) {
             replacement = PyObject_CallFunctionObjArgs(decoderEndObject, mapping, NULL);
@@ -371,21 +372,22 @@ struct PyHandler {
         HandlerContext ctx;
         ctx.isObject = false;
         ctx.object = list;
+        Py_INCREF(list);
 
         stack.push_back(ctx);
 
         return true;
     }
 
     bool EndArray(SizeType elementCount) {
+        PyObject* sequence = stack.back().object;
+        stack.pop_back();
+
         if (decoderEndArray == NULL) {
-            stack.pop_back();
+            Py_DECREF(sequence);
             return true;
         }
 
-        PyObject* sequence = stack.back().object;
-        stack.pop_back();
-
         PyObject* replacement = PyObject_CallFunctionObjArgs(decoderEndArray, sequence, NULL);
         Py_DECREF(sequence);
         if (replacement == NULL)