mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18408: Handle PyArena_AddPyObject() failure in ast.c

Browse source 
PyList_Append() (called by PyArena_AddPyObject()) can fail because of a
MemoryError for example.
This commit is contained in:
Victor Stinner 2013-07-17 00:57:58 +02:00
parent d594f24fbc
commit 43d8195a70
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Python/ast.c
View file

@ -560,7 +560,10 @@ new_identifier(const char *n, struct compiling *c)
id = id2; id = id2;
} }
PyUnicode_InternInPlace(&id); PyUnicode_InternInPlace(&id);
PyArena_AddPyObject(c->c_arena, id); if (PyArena_AddPyObject(c->c_arena, id) < 0) {
Py_DECREF(id);
return NULL;
}
return id; return id;
} }
@ -1847,7 +1850,10 @@ ast_for_atom(struct compiling *c, const node *n)
} }
return NULL; return NULL;
} }
PyArena_AddPyObject(c->c_arena, str); if (PyArena_AddPyObject(c->c_arena, str) < 0) {
Py_DECREF(str);
return NULL;
}
if (bytesmode) if (bytesmode)
return Bytes(str, LINENO(n), n->n_col_offset, c->c_arena); return Bytes(str, LINENO(n), n->n_col_offset, c->c_arena);
else else
@ -1858,7 +1864,10 @@ ast_for_atom(struct compiling *c, const node *n)
if (!pynum) if (!pynum)
return NULL; return NULL;
PyArena_AddPyObject(c->c_arena, pynum); if (PyArena_AddPyObject(c->c_arena, pynum) < 0) {
Py_DECREF(pynum);
return NULL;
}
return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena); return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena);
} }
case ELLIPSIS: /* Ellipsis */ case ELLIPSIS: /* Ellipsis */
@ -2845,13 +2854,19 @@ alias_for_import_name(struct compiling *c, const node *n, int store)
return NULL; return NULL;
str = uni; str = uni;
PyUnicode_InternInPlace(&str); PyUnicode_InternInPlace(&str);
PyArena_AddPyObject(c->c_arena, str); if (PyArena_AddPyObject(c->c_arena, str) < 0) {
Py_DECREF(str);
return NULL;
}
return alias(str, NULL, c->c_arena); return alias(str, NULL, c->c_arena);
} }
break; break;
case STAR: case STAR:
str = PyUnicode_InternFromString("*"); str = PyUnicode_InternFromString("*");
PyArena_AddPyObject(c->c_arena, str); if (PyArena_AddPyObject(c->c_arena, str) < 0) {
Py_DECREF(str);
return NULL;
}
return alias(str, NULL, c->c_arena); return alias(str, NULL, c->c_arena);
default: default:
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,