From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 16 Jul 2017 04:29:16 +0000 (+0300)
Subject: bpo-30936: Fix a reference leak in json when fail to sort keys. (#2712)
X-Git-Tag: v3.7.0a1~414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49f6449ef4b81537c19b82329caaf60596c516c2;p=thirdparty%2FPython%2Fcpython.git

bpo-30936: Fix a reference leak in json when fail to sort keys. (#2712)
---

diff --git a/Lib/test/test_json/test_speedups.py b/Lib/test/test_json/test_speedups.py
index 8d98ab5ae1c3..56f1882001d6 100644
--- a/Lib/test/test_json/test_speedups.py
+++ b/Lib/test/test_json/test_speedups.py
@@ -44,3 +44,7 @@ class TestEncode(CTest):
         self.assertRaises(ZeroDivisionError, test, 'check_circular')
         self.assertRaises(ZeroDivisionError, test, 'allow_nan')
         self.assertRaises(ZeroDivisionError, test, 'sort_keys')
+
+    def test_unsortable_keys(self):
+        with self.assertRaises(TypeError):
+            self.json.encoder.JSONEncoder(sort_keys=True).encode({'a': 1, 1: 'a'})
diff --git a/Modules/_json.c b/Modules/_json.c
index 07bcd318b1eb..6cc31c6e3712 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1589,8 +1589,10 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
     items = PyMapping_Items(dct);
     if (items == NULL)
         goto bail;
-    if (s->sort_keys && PyList_Sort(items) < 0)
+    if (s->sort_keys && PyList_Sort(items) < 0) {
+        Py_DECREF(items);
         goto bail;
+    }
     it = PyObject_GetIter(items);
     Py_DECREF(items);
     if (it == NULL)