diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-07-16 04:29:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-16 04:29:16 (GMT) |
| commit | 49f6449ef4b81537c19b82329caaf60596c516c2 (patch) | |
| tree | 416e402ff426c12cca2324506363d4be167adf95 | |
| parent | 95bebb7264afad88f31f7cdc3b28bacde7c46f93 (diff) | |
| download | cpython-49f6449ef4b81537c19b82329caaf60596c516c2.zip cpython-49f6449ef4b81537c19b82329caaf60596c516c2.tar.gz cpython-49f6449ef4b81537c19b82329caaf60596c516c2.tar.bz2 | |
bpo-30936: Fix a reference leak in json when fail to sort keys. (#2712)
| -rw-r--r-- | Lib/test/test_json/test_speedups.py | 4 | ||||
| -rw-r--r-- | Modules/_json.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_json/test_speedups.py b/Lib/test/test_json/test_speedups.py index 8d98ab5..56f1882 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 07bcd31..6cc31c6 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) |