mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Can't return NULL from a void function. If there is a memory error,

Browse source 
about the best we can do is call PyErr_WriteUnraisable and go on.
We won't be able to do the call below either, so verify delstr is valid.
This commit is contained in:
Neal Norwitz 2006-08-14 00:59:03 +00:00
parent 714a59d265
commit af33f2d571
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/classobject.c
View file

@ -624,9 +624,9 @@ instance_dealloc(register PyInstanceObject *inst)
if (delstr == NULL) {
delstr = PyString_InternFromString("__del__");
if (delstr == NULL)
return NULL;
PyErr_WriteUnraisable((PyObject*)inst);
}
if ((del = instance_getattr2(inst, delstr)) != NULL) {
if (delstr && (del = instance_getattr2(inst, delstr)) != NULL) {
PyObject *res = PyEval_CallObject(del, (PyObject *)NULL);
if (res == NULL)
PyErr_WriteUnraisable(del);