commit 595e3cbb3db46124abcbf605bbe8d5784a69213e
author Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:09:28 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:09:28 2008 +0000
tree 41cd219c268744ce348f24885c3801cbabc86c41
parent eaede315d1f9e18c6fcad30d3b13f8b2a7242e37

check for error conditions in _json #3623

Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index 88510a7..832b1ff 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -179,11 +179,13 @@
         errmsg_fn = PyObject_GetAttrString(decoder, "errmsg");
         if (errmsg_fn == NULL)
             return;
-        Py_XDECREF(decoder);
+        Py_DECREF(decoder);
     }
     pymsg = PyObject_CallFunction(errmsg_fn, "(zOn)", msg, s, end);
-    PyErr_SetObject(PyExc_ValueError, pymsg);
-    Py_DECREF(pymsg);
+    if (pymsg) {
+        PyErr_SetObject(PyExc_ValueError, pymsg);
+        Py_DECREF(pymsg);
+    }
 /*
 
 def linecol(doc, pos):