encoder_listencode_obj recursion check

Signed-off-by: Bob Ippolito <bob@redivi.com>

simplejson/_speedups.c

@@ -2145,6 +2145,5 @@
 encoder_listencode_obj(PyEncoderObject *s, PyObject *rval, PyObject *obj, Py_ssize_t indent_level)
 {
     /* Encode Python object obj to a JSON term, rval is a PyList */
-    PyObject *newobj;
-    int rv;
+    int rv = -1;
 
@@ -2150,3 +2149,4 @@
 
+    do {
         if (obj == Py_None || obj == Py_True || obj == Py_False) {
             PyObject *cstr = _encoded_const(obj);
@@ -2151,9 +2151,8 @@
         if (obj == Py_None || obj == Py_True || obj == Py_False) {
             PyObject *cstr = _encoded_const(obj);
-        if (cstr == NULL)
-            return -1;
-        return _steal_list_append(rval, cstr);
+            if (cstr != NULL)
+                rv = _steal_list_append(rval, cstr);
         }
         else if (PyString_Check(obj) || PyUnicode_Check(obj))
         {
             PyObject *encoded = encoder_encode_string(s, obj);
@@ -2156,10 +2155,9 @@
         }
         else if (PyString_Check(obj) || PyUnicode_Check(obj))
         {
             PyObject *encoded = encoder_encode_string(s, obj);
-        if (encoded == NULL)
-            return -1;
-        return _steal_list_append(rval, encoded);
+            if (encoded != NULL)
+                rv = _steal_list_append(rval, encoded);
         }
         else if (PyInt_Check(obj) || PyLong_Check(obj)) {
             PyObject *encoded = PyObject_Str(obj);
@@ -2163,9 +2161,8 @@
         }
         else if (PyInt_Check(obj) || PyLong_Check(obj)) {
             PyObject *encoded = PyObject_Str(obj);
-        if (encoded == NULL)
-            return -1;
-        return _steal_list_append(rval, encoded);
+            if (encoded != NULL)
+                rv = _steal_list_append(rval, encoded);
         }
         else if (PyFloat_Check(obj)) {
             PyObject *encoded = encoder_encode_float(s, obj);
@@ -2169,8 +2166,7 @@
         }
         else if (PyFloat_Check(obj)) {
             PyObject *encoded = encoder_encode_float(s, obj);
-        if (encoded == NULL)
-            return -1;
-        return _steal_list_append(rval, encoded);
+            if (encoded != NULL)
+                rv = _steal_list_append(rval, encoded);
         }
         else if (PyList_Check(obj) || PyTuple_Check(obj)) {
@@ -2175,5 +2171,5 @@
         }
         else if (PyList_Check(obj) || PyTuple_Check(obj)) {
-        return encoder_listencode_list(s, rval, obj, indent_level);
+            rv = encoder_listencode_list(s, rval, obj, indent_level);
         }
         else if (PyDict_Check(obj)) {
@@ -2178,6 +2174,6 @@
         }
         else if (PyDict_Check(obj)) {
-        return encoder_listencode_dict(s, rval, obj, indent_level);
+            rv = encoder_listencode_dict(s, rval, obj, indent_level);
         }
         else if (s->use_decimal && Decimal_Check(obj)) {
             PyObject *encoded = PyObject_Str(obj);
@@ -2181,9 +2177,8 @@
         }
         else if (s->use_decimal && Decimal_Check(obj)) {
             PyObject *encoded = PyObject_Str(obj);
-        if (encoded == NULL)
-            return -1;
-        return _steal_list_append(rval, encoded);
+            if (encoded != NULL)
+                rv = _steal_list_append(rval, encoded);
         }
         else {
             PyObject *ident = NULL;
@@ -2187,7 +2182,8 @@
         }
         else {
             PyObject *ident = NULL;
+            PyObject *newobj;
             if (s->markers != Py_None) {
                 int has_key;
                 ident = PyLong_FromVoidPtr(obj);
                 if (ident == NULL)
@@ -2190,10 +2186,10 @@
             if (s->markers != Py_None) {
                 int has_key;
                 ident = PyLong_FromVoidPtr(obj);
                 if (ident == NULL)
-                return -1;
+                    break;
                 has_key = PyDict_Contains(s->markers, ident);
                 if (has_key) {
                     if (has_key != -1)
                         PyErr_SetString(PyExc_ValueError, "Circular reference detected");
                     Py_DECREF(ident);
@@ -2195,9 +2191,9 @@
                 has_key = PyDict_Contains(s->markers, ident);
                 if (has_key) {
                     if (has_key != -1)
                         PyErr_SetString(PyExc_ValueError, "Circular reference detected");
                     Py_DECREF(ident);
-                return -1;
+                    break;
                 }
                 if (PyDict_SetItem(s->markers, ident, obj)) {
                     Py_DECREF(ident);
@@ -2201,9 +2197,9 @@
                 }
                 if (PyDict_SetItem(s->markers, ident, obj)) {
                     Py_DECREF(ident);
-                return -1;
+                    break;
                 }
             }
             newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
             if (newobj == NULL) {
                 Py_XDECREF(ident);
@@ -2205,11 +2201,11 @@
                 }
             }
             newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
             if (newobj == NULL) {
                 Py_XDECREF(ident);
-            return -1;
+                break;
             }
             rv = encoder_listencode_obj(s, rval, newobj, indent_level);
             Py_DECREF(newobj);
             if (rv) {
                 Py_XDECREF(ident);
@@ -2211,7 +2207,7 @@
             }
             rv = encoder_listencode_obj(s, rval, newobj, indent_level);
             Py_DECREF(newobj);
             if (rv) {
                 Py_XDECREF(ident);
-            return -1;
+                rv = -1;
             }
@@ -2217,4 +2213,4 @@
             }
-        if (ident != NULL) {
+            else if (ident != NULL) {
                 if (PyDict_DelItem(s->markers, ident)) {
                     Py_XDECREF(ident);
@@ -2219,6 +2215,6 @@
                 if (PyDict_DelItem(s->markers, ident)) {
                     Py_XDECREF(ident);
-                return -1;
+                    rv = -1;
                 }
                 Py_XDECREF(ident);
             }
@@ -2222,5 +2218,8 @@
                 }
                 Py_XDECREF(ident);
             }
+        }
+    } while (0);
+    Py_LeaveRecursiveCall();
     return rv;
 }
@@ -2225,6 +2224,5 @@
     return rv;
 }
-}
 
 static int
 encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ssize_t indent_level)