mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Handle more memory allocation failures without crashing.

Browse source
This commit is contained in:
Neal Norwitz 2006-07-21 07:59:47 +00:00
parent 33722aec57
commit d12bd012a6
5 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/ast.c
View file

@ -638,8 +638,10 @@ ast_for_arguments(struct compiling *c, const node *n)
anything other than EQUAL or a comma? */ anything other than EQUAL or a comma? */
/* XXX Should NCH(n) check be made a separate check? */ /* XXX Should NCH(n) check be made a separate check? */
if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) { if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
asdl_seq_SET(defaults, j++, expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
ast_for_expr(c, CHILD(n, i + 2))); if (!expression)
goto error;
asdl_seq_SET(defaults, j++, expression);
i += 2; i += 2;
found_default = 1; found_default = 1;
} }

9
Python/compile.c
View file

@ -1105,8 +1105,17 @@ compiler_enter_scope(struct compiler *c, identifier name, void *key,
u->u_name = name; u->u_name = name;
u->u_varnames = list2dict(u->u_ste->ste_varnames); u->u_varnames = list2dict(u->u_ste->ste_varnames);
u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0); u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
if (!u->u_varnames || !u->u_cellvars) {
compiler_unit_free(u);
return 0;
}
u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS, u->u_freevars = dictbytype(u->u_ste->ste_symbols, FREE, DEF_FREE_CLASS,
PyDict_Size(u->u_cellvars)); PyDict_Size(u->u_cellvars));
if (!u->u_freevars) {
compiler_unit_free(u);
return 0;
}
u->u_blocks = NULL; u->u_blocks = NULL;
u->u_tmpname = 0; u->u_tmpname = 0;

17
Python/pythonrun.c
View file

@ -1204,8 +1204,12 @@ PyRun_StringFlags(const char *str, int start, PyObject *globals,
{ {
PyObject *ret = NULL; PyObject *ret = NULL;
PyArena *arena = PyArena_New(); PyArena *arena = PyArena_New();
mod_ty mod = PyParser_ASTFromString(str, "<string>", start, flags, mod_ty mod;
arena);
if (arena == NULL)
return NULL;
mod = PyParser_ASTFromString(str, "<string>", start, flags, arena);
if (mod != NULL) if (mod != NULL)
ret = run_mod(mod, "<string>", globals, locals, flags, arena); ret = run_mod(mod, "<string>", globals, locals, flags, arena);
PyArena_Free(arena); PyArena_Free(arena);
@ -1218,8 +1222,13 @@ PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals,
{ {
PyObject *ret; PyObject *ret;
PyArena *arena = PyArena_New(); PyArena *arena = PyArena_New();
mod_ty mod = PyParser_ASTFromFile(fp, filename, start, 0, 0, mod_ty mod;
flags, NULL, arena);
if (arena == NULL)
return NULL;
mod = PyParser_ASTFromFile(fp, filename, start, 0, 0,
flags, NULL, arena);
if (mod == NULL) { if (mod == NULL) {
PyArena_Free(arena); PyArena_Free(arena);
return NULL; return NULL;

12
Python/symtable.c
View file

@ -221,8 +221,12 @@ PySymtable_Build(mod_ty mod, const char *filename, PyFutureFeatures *future)
return st; return st;
st->st_filename = filename; st->st_filename = filename;
st->st_future = future; st->st_future = future;
symtable_enter_block(st, GET_IDENTIFIER(top), ModuleBlock, if (!symtable_enter_block(st, GET_IDENTIFIER(top), ModuleBlock,
(void *)mod, 0); (void *)mod, 0)) {
PySymtable_Free(st);
return NULL;
}
st->st_top = st->st_cur; st->st_top = st->st_cur;
st->st_cur->ste_unoptimized = OPT_TOPLEVEL; st->st_cur->ste_unoptimized = OPT_TOPLEVEL;
/* Any other top-level initialization? */ /* Any other top-level initialization? */
@ -728,6 +732,8 @@ symtable_exit_block(struct symtable *st, void *ast)
if (end >= 0) { if (end >= 0) {
st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack, st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack,
end); end);
if (st->st_cur == NULL)
return 0;
Py_INCREF(st->st_cur); Py_INCREF(st->st_cur);
if (PySequence_DelItem(st->st_stack, end) < 0) if (PySequence_DelItem(st->st_stack, end) < 0)
return 0; return 0;
@ -749,6 +755,8 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
Py_DECREF(st->st_cur); Py_DECREF(st->st_cur);
} }
st->st_cur = PySTEntry_New(st, name, block, ast, lineno); st->st_cur = PySTEntry_New(st, name, block, ast, lineno);
if (st->st_cur == NULL)
return 0;
if (name == GET_IDENTIFIER(top)) if (name == GET_IDENTIFIER(top))
st->st_global = st->st_cur->ste_symbols; st->st_global = st->st_cur->ste_symbols;
if (prev) { if (prev) {

2
Python/thread.c
View file

@ -267,6 +267,8 @@ find_key(int key, void *value)
struct key *p; struct key *p;
long id = PyThread_get_thread_ident(); long id = PyThread_get_thread_ident();
if (!keymutex)
return NULL;
PyThread_acquire_lock(keymutex, 1); PyThread_acquire_lock(keymutex, 1);
for (p = keyhead; p != NULL; p = p->next) { for (p = keyhead; p != NULL; p = p->next) {
if (p->id == id && p->key == key) if (p->id == id && p->key == key)