Merged revisions 66938,66942 via svnmerge from

benjaminp · benjaminp · commit 8e8c2152fbfb · 2008-10-16T21:56:24.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66938 | benjamin.peterson | 2008-10-16 16:27:54 -0500 (Thu, 16 Oct 2008) | 1 line

  fix possible ref leak
........
  r66942 | benjamin.peterson | 2008-10-16 16:48:06 -0500 (Thu, 16 Oct 2008) | 1 line

  fix more possible ref leaks in _json and use Py_CLEAR
........
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -276,6 +276,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);
@@ -377,6 +378,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);
@@ -386,8 +388,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);
@@ -436,6 +437,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);
@@ -537,6 +539,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);
@@ -546,8 +549,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, 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);

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`276`	`276`	`goto bail;`
`277`	`277`	`}`
`278`	`278`	`if (PyList_Append(chunks, chunk)) {`
	`279`	`+ Py_DECREF(chunk);`
`279`	`280`	`goto bail;`
`280`	`281`	`}`
`281`	`282`	`Py_DECREF(chunk);`
`@@ -377,6 +378,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`377`	`378`	`goto bail;`
`378`	`379`	`}`
`379`	`380`	`if (PyList_Append(chunks, chunk)) {`
	`381`	`+ Py_DECREF(chunk);`
`380`	`382`	`goto bail;`
`381`	`383`	`}`
`382`	`384`	`Py_DECREF(chunk);`
`@@ -386,8 +388,7 @@ scanstring_str(PyObject pystr, Py_ssize_t end, char encoding, int strict)`
`386`	`388`	`if (rval == NULL) {`
`387`	`389`	`goto bail;`
`388`	`390`	`}`
`389`		`- Py_DECREF(chunks);`
`390`		`- chunks = NULL;`
	`391`	`+ Py_CLEAR(chunks);`
`391`	`392`	`return Py_BuildValue("(Nn)", rval, end);`
`392`	`393`	`bail:`
`393`	`394`	`Py_XDECREF(chunks);`
`@@ -436,6 +437,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict)`
`436`	`437`	`goto bail;`
`437`	`438`	`}`
`438`	`439`	`if (PyList_Append(chunks, chunk)) {`
	`440`	`+ Py_DECREF(chunk);`
`439`	`441`	`goto bail;`
`440`	`442`	`}`
`441`	`443`	`Py_DECREF(chunk);`
`@@ -537,6 +539,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict)`
`537`	`539`	`goto bail;`
`538`	`540`	`}`
`539`	`541`	`if (PyList_Append(chunks, chunk)) {`
	`542`	`+ Py_DECREF(chunk);`
`540`	`543`	`goto bail;`
`541`	`544`	`}`
`542`	`545`	`Py_DECREF(chunk);`
`@@ -546,8 +549,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict)`
`546`	`549`	`if (rval == NULL) {`
`547`	`550`	`goto bail;`
`548`	`551`	`}`
`549`		`- Py_DECREF(chunks);`
`550`		`- chunks = NULL;`
	`552`	`+ Py_CLEAR(chunks);`
`551`	`553`	`return Py_BuildValue("(Nn)", rval, end);`
`552`	`554`	`bail:`
`553`	`555`	`Py_XDECREF(chunks);`