commit 8e8c2152fbfb1d48929d9be8222cb2f73b562060
author Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:56:24 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:56:24 2008 +0000
tree fb18651e439e7f0e80f7741a067d17eeb31ce661
parent a13d475901553b4a0ec7ed679ce2eac4598b557f

Merged revisions 66938,66942 via svnmerge from
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
........

Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index 0068bda..9c35f64 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -276,6 +276,7 @@
                 goto bail;
             }
             if (PyList_Append(chunks, chunk)) {
+                Py_DECREF(chunk);
                 goto bail;
             }
             Py_DECREF(chunk);
@@ -377,6 +378,7 @@
             goto bail;
         }
         if (PyList_Append(chunks, chunk)) {
+            Py_DECREF(chunk);
             goto bail;
         }
         Py_DECREF(chunk);
@@ -386,8 +388,7 @@
     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 @@
                 goto bail;
             }
             if (PyList_Append(chunks, chunk)) {
+                Py_DECREF(chunk);
                 goto bail;
             }
             Py_DECREF(chunk);
@@ -537,6 +539,7 @@
             goto bail;
         }
         if (PyList_Append(chunks, chunk)) {
+            Py_DECREF(chunk);
             goto bail;
         }
         Py_DECREF(chunk);
@@ -546,8 +549,7 @@
     if (rval == NULL) {
         goto bail;
     }
-    Py_DECREF(chunks);
-    chunks = NULL;
+    Py_CLEAR(chunks);
     return Py_BuildValue("(Nn)", rval, end);
 bail:
     Py_XDECREF(chunks);