Kaydet (Commit) af33f2d5 authored tarafından Neal Norwitz's avatar Neal Norwitz

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

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.
üst 714a59d2
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment