File ujson-1.35-sort_keys-segfault.patch of Package python-ujson

Overview Repositories Revisions Requests Users Attributes Meta

File ujson-1.35-sort_keys-segfault.patch of Package python-ujson (Revision b315cc9bdd640070e3581696dacff698)

Currently displaying revision b315cc9bdd640070e3581696dacff698 , Show latest

commit 870ee48fe109c289033cd0b7543b6f5ea4e6f128
Author: Joakim Hamren <joakim.hamren@gmail.com>
Date:   Sat Feb 4 01:07:52 2017 +0100

Fixes for sort_keys bug and a typo.
    
        - Fixed segfault when using sort_keys=True on dict with unorderable keys (GH247)
    
        - Fixed refcount becoming negative when using sort_keys=True (GH243)
    
        - Fixed compile error when defining JSON_NO_EXTRA_WHITESPACE
          caused by a wrongly named variable. (GH245)

Index: ujson-1.35/lib/ultrajsonenc.c
===================================================================
--- ujson-1.35.orig/lib/ultrajsonenc.c
+++ ujson-1.35/lib/ultrajsonenc.c
@@ -718,7 +718,7 @@ void encode(JSOBJ obj, JSONObjectEncoder
 {
   const char *value;
   char *objName;
-  int count;
+  int count, res;
   JSOBJ iterObj;
   size_t szlen;
   JSONTypeContext tc;
@@ -792,7 +792,7 @@ void encode(JSOBJ obj, JSONObjectEncoder
           {
             Buffer_AppendCharUnchecked (enc, ',');
 #ifndef JSON_NO_EXTRA_WHITESPACE
-            Buffer_AppendCharUnchecked (buffer, ' ');
+            Buffer_AppendCharUnchecked (enc, ' ');
 #endif
             Buffer_AppendIndentNewlineUnchecked (enc);
           }
@@ -819,8 +819,16 @@ void encode(JSOBJ obj, JSONObjectEncoder
     Buffer_AppendCharUnchecked (enc, '{');
     Buffer_AppendIndentNewlineUnchecked (enc);
 
-    while (enc->iterNext(obj, &tc))
+    while ((res = enc->iterNext(obj, &tc)))
     {
+      if(res < 0)
+      {
+        enc->iterEnd(obj, &tc);
+        enc->endTypeContext(obj, &tc);
+        enc->level--;
+        return;
+      }
+
       if (count > 0)
       {
         Buffer_AppendCharUnchecked (enc, ',');
Index: ujson-1.35/python/objToJSON.c
===================================================================
--- ujson-1.35.orig/python/objToJSON.c
+++ ujson-1.35/python/objToJSON.c
@@ -558,6 +558,7 @@ int SortedDict_iterNext(JSOBJ obj, JSONT
     // Sort the list.
     if (PyList_Sort(items) < 0)
     {
+      PyErr_SetString(PyExc_ValueError, "unorderable keys");
       goto error;
     }
 
@@ -628,7 +629,6 @@ void SortedDict_iterEnd(JSOBJ obj, JSONT
 {
   GET_TC(tc)->itemName = NULL;
   GET_TC(tc)->itemValue = NULL;
-  Py_DECREF(GET_TC(tc)->newObj);
   Py_DECREF(GET_TC(tc)->dictObj);
   PRINTMARK();
 }

Places

File ujson-1.35-sort_keys-segfault.patch of Package python-ujson (Revision b315cc9bdd640070e3581696dacff698)

Places