Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded. 

Patch by Serhiy Storchaka.
This commit is contained in:
Antoine Pitrou 2012-11-01 20:03:30 +01:00
parent 1511a5a3af 5ebe65f8cb
commit 53d36b6912
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/json_tests/test_dump.py
View File

@ -20,6 +20,14 @@ class TestDump:
{2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True), {2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True),
'{"false": 1, "2": 3.0, "4.0": 5, "6": true}') '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
# Issue 16228: Crash on encoding resized list
def test_encode_mutated(self):
a = [object()] * 10
def crasher(obj):
del a[-1]
self.assertEqual(self.dumps(a, default=crasher),
'[null, null, null, null, null]')
class TestPyDump(TestDump, PyTest): pass class TestPyDump(TestDump, PyTest): pass

3
Misc/NEWS
View File

@ -85,6 +85,9 @@ Core and Builtins
Library Library
------- -------
- Issue #16228: Fix a crash in the json module where a list changes size
while it is being encoded. Patch by Serhiy Storchaka.
- Issue #16351: New function gc.get_stats() returns per-generation collection - Issue #16351: New function gc.get_stats() returns per-generation collection
statistics. statistics.

10
Modules/_json.c
View File

@ -1659,8 +1659,6 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
static PyObject *empty_array = NULL; static PyObject *empty_array = NULL;
PyObject *ident = NULL; PyObject *ident = NULL;
PyObject *s_fast = NULL; PyObject *s_fast = NULL;
Py_ssize_t num_items;
PyObject **seq_items;
Py_ssize_t i; Py_ssize_t i;
if (open_array == NULL || close_array == NULL || empty_array == NULL) { if (open_array == NULL || close_array == NULL || empty_array == NULL) {
@ -1674,8 +1672,7 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence"); s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
if (s_fast == NULL) if (s_fast == NULL)
return -1; return -1;
num_items = PySequence_Fast_GET_SIZE(s_fast); if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
if (num_items == 0) {
Py_DECREF(s_fast); Py_DECREF(s_fast);
return _PyAccu_Accumulate(acc, empty_array); return _PyAccu_Accumulate(acc, empty_array);
} }
@ -1696,7 +1693,6 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
} }
} }
seq_items = PySequence_Fast_ITEMS(s_fast);
if (_PyAccu_Accumulate(acc, open_array)) if (_PyAccu_Accumulate(acc, open_array))
goto bail; goto bail;
if (s->indent != Py_None) { if (s->indent != Py_None) {
@ -1708,8 +1704,8 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
buf += newline_indent buf += newline_indent
*/ */
} }
for (i = 0; i < num_items; i++) { for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
PyObject *obj = seq_items[i]; PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
if (i) { if (i) {
if (_PyAccu_Accumulate(acc, s->item_separator)) if (_PyAccu_Accumulate(acc, s->item_separator))
goto bail; goto bail;