fix more possible ref leaks in _json and use Py_CLEAR

benjamin.peterson · benjamin.peterson · commit d4e520ea0bd2 · 2008-10-16T21:48:06.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@66942 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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);
-    chunks = NULL;
+    Py_CLEAR(chunks);
     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);

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`271`	`271`	`goto bail;`
`272`	`272`	`}`
`273`	`273`	`if (PyList_Append(chunks, chunk)) {`
	`274`	`+ Py_DECREF(chunk);`
`274`	`275`	`goto bail;`
`275`	`276`	`}`
`276`	`277`	`Py_DECREF(chunk);`
`@@ -372,6 +373,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`372`	`373`	`goto bail;`
`373`	`374`	`}`
`374`	`375`	`if (PyList_Append(chunks, chunk)) {`
	`376`	`+ Py_DECREF(chunk);`
`375`	`377`	`goto bail;`
`376`	`378`	`}`
`377`	`379`	`Py_DECREF(chunk);`
`@@ -381,8 +383,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`381`	`383`	`if (rval == NULL) {`
`382`	`384`	`goto bail;`
`383`	`385`	`}`
`384`		`- Py_DECREF(chunks);`
`385`		`- chunks = NULL;`
	`386`	`+ Py_CLEAR(chunks);`
`386`	`387`	`return Py_BuildValue("(Nn)", rval, end);`
`387`	`388`	`bail:`
`388`	`389`	`Py_XDECREF(chunks);`
`@@ -533,6 +534,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict)`
`533`	`534`	`goto bail;`
`534`	`535`	`}`
`535`	`536`	`if (PyList_Append(chunks, chunk)) {`
	`537`	`+ Py_DECREF(chunk);`
`536`	`538`	`goto bail;`
`537`	`539`	`}`
`538`	`540`	`Py_DECREF(chunk);`