fix more possible ref leaks in _json and use Py_CLEAR

336680ec · Benjamin Peterson · 865cd640 · 336680ec
Commit 336680ec authored Oct 16, 2008 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Modules/_json.c Modules/_json.c +4 -2

No files found.
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -271,6 +271,7 @@ scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict)
                goto bail;
            }
            if (PyList_Append(chunks, chunk)) {
+                Py_DECREF(chunk);
                goto bail;
            }
            Py_DECREF(chunk);
@@ -372,6 +373,7 @@ scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict)
            goto bail;
        }
        if (PyList_Append(chunks, chunk)) {
+            Py_DECREF(chunk);
            goto bail;
        }
        Py_DECREF(chunk);
@@ -381,8 +383,7 @@ scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict)
    if (rval == NULL) {
        goto bail;
    }
-    Py_DECREF(chunks);
+    Py_CLEAR(chunks);
-    chunks = NULL;
    return Py_BuildValue("(Nn)", rval, end);
 bail:
    Py_XDECREF(chunks);
@@ -533,6 +534,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict)
            goto bail;
        }
        if (PyList_Append(chunks, chunk)) {
+            Py_DECREF(chunk);
            goto bail;
        }
        Py_DECREF(chunk);