mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Cause a PyObject_Malloc() failure to trigger a MemoryError, and then

Browse source 
add 'if (PyErr_Occurred())' checks to various places so that NULL is
returned properly.

2.4 backport candidate.
This commit is contained in:
Andrew M. Kuchling 2006-10-04 13:42:43 +00:00
parent 7ccbca93a2
commit 36126c424a
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/_sre.c
View file

@ -1166,9 +1166,10 @@ entrance:
/* install new repeat context */
ctx->u.rep = (SRE_REPEAT*) PyObject_MALLOC(sizeof(*ctx->u.rep));
/* XXX(nnorwitz): anything else we need to do on error? */
if (!ctx->u.rep)
if (!ctx->u.rep) {
PyErr_NoMemory();
RETURN_FAILURE;
}
ctx->u.rep->count = -1;
ctx->u.rep->pattern = ctx->pattern;
ctx->u.rep->prev = state->repeat;
@ -1884,6 +1885,8 @@ pattern_match(PatternObject* self, PyObject* args, PyObject* kw)
}
TRACE(("|%p|%p|END\n", PatternObject_GetCode(self), state.ptr));
if (PyErr_Occurred())
return NULL;
state_fini(&state);
@ -1922,6 +1925,9 @@ pattern_search(PatternObject* self, PyObject* args, PyObject* kw)
state_fini(&state);
if (PyErr_Occurred())
return NULL;
return pattern_new_match(self, &state, status);
}
@ -2071,6 +2077,9 @@ pattern_findall(PatternObject* self, PyObject* args, PyObject* kw)
#endif
}
if (PyErr_Occurred())
goto error;
if (status <= 0) {
if (status == 0)
break;
@ -2198,6 +2207,9 @@ pattern_split(PatternObject* self, PyObject* args, PyObject* kw)
#endif
}
if (PyErr_Occurred())
goto error;
if (status <= 0) {
if (status == 0)
break;
@ -2347,6 +2359,9 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string,
#endif
}
if (PyErr_Occurred())
goto error;
if (status <= 0) {
if (status == 0)
break;
@ -3250,6 +3265,8 @@ scanner_match(ScannerObject* self, PyObject *unused)
status = sre_umatch(state, PatternObject_GetCode(self->pattern));
#endif
}
if (PyErr_Occurred())
return NULL;
match = pattern_new_match((PatternObject*) self->pattern,
state, status);
@ -3281,6 +3298,8 @@ scanner_search(ScannerObject* self, PyObject *unused)
status = sre_usearch(state, PatternObject_GetCode(self->pattern));
#endif
}
if (PyErr_Occurred())
return NULL;
match = pattern_new_match((PatternObject*) self->pattern,
state, status);