mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #22338: Fix a crash in the json module on memory allocation failure.

Browse source
This commit is contained in:
Victor Stinner 2014-09-10 23:31:42 +02:00
parent 6d46dff5b5
commit 31a3ec313d
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -32,6 +32,8 @@ Core and Builtins
Library Library
------- -------
- Issue #22338: Fix a crash in the json module on memory allocation failure.
- Issue #22226: First letter no longer is stripped from the "status" key in - Issue #22226: First letter no longer is stripped from the "status" key in
the result of Treeview.heading(). the result of Treeview.heading().

3
Modules/_json.c
View file

@ -287,7 +287,7 @@ _build_rval_index_tuple(PyObject *rval, Py_ssize_t idx) {
} \ } \
} \ } \
if (PyList_Append(chunks, chunk)) { \ if (PyList_Append(chunks, chunk)) { \
Py_DECREF(chunk); \ Py_CLEAR(chunk); \
goto bail; \ goto bail; \
} \ } \
Py_CLEAR(chunk); \ Py_CLEAR(chunk); \
@ -1555,6 +1555,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
if (item == NULL) if (item == NULL)
goto bail; goto bail;
PyList_SET_ITEM(items, i, item); PyList_SET_ITEM(items, i, item);
item = NULL;
Py_DECREF(key); Py_DECREF(key);
} }
} }