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

Issue #18552: Check return value of PyArena_AddPyObject() in obj2ast_object().

This commit is contained in:
Christian Heimes 2013-07-27 00:33:13 +02:00
parent 1acc129d48
commit 70c94e7896
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ What's New in Python 3.3.3 release candidate 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #18552: Check return value of PyArena_AddPyObject() in
obj2ast_object().
- Issue #18560: Fix potential NULL pointer dereference in sum(). - Issue #18560: Fix potential NULL pointer dereference in sum().
- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0], - Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],

10
Parser/asdl_c.py
View File

@ -834,9 +834,13 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
{ {
if (obj == Py_None) if (obj == Py_None)
obj = NULL; obj = NULL;
if (obj) if (obj) {
PyArena_AddPyObject(arena, obj); if (PyArena_AddPyObject(arena, obj) < 0) {
Py_XINCREF(obj); *out = NULL;
return -1;
}
Py_INCREF(obj);
}
*out = obj; *out = obj;
return 0; return 0;
} }

10
Python/Python-ast.c
View File

@ -688,9 +688,13 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
{ {
if (obj == Py_None) if (obj == Py_None)
obj = NULL; obj = NULL;
if (obj) if (obj) {
PyArena_AddPyObject(arena, obj); if (PyArena_AddPyObject(arena, obj) < 0) {
Py_XINCREF(obj); *out = NULL;
return -1;
}
Py_INCREF(obj);
}
*out = obj; *out = obj;
return 0; return 0;
} }