commit a13d475901553b4a0ec7ed679ce2eac4598b557f
author Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:17:24 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:17:24 2008 +0000
tree dc0745a76b64e954cded961b6ec99bc08bdeac78
parent 60192084c405292f874d886eed05ed83614d20c4

merge r66932 and add a few py3k only checks

Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index 47c4a56..0068bda 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):
@@ -602,7 +604,7 @@
                      Py_TYPE(pystr)->tp_name);
         return NULL;
     }
-    if (PyBytes_Check(rval)) {
+    if (rval != NULL && PyBytes_Check(rval)) {
         PyObject *urval = PyUnicode_DecodeASCII(PyBytes_AS_STRING(rval), PyBytes_GET_SIZE(rval), NULL);
         Py_DECREF(rval);
         return urval;