diff options
Diffstat (limited to 'Objects/abstract.c')
| -rw-r--r-- | Objects/abstract.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index a19d28c..6f8432e 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2080,16 +2080,6 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where) assert((func != NULL) ^ (where != NULL)); -#ifndef NDEBUG - /* In debug mode: abort() with an assertion error. Use two different - assertions, so if an assertion fails, it's possible to know - if result was set or not and if an exception was raised or not. */ - if (result != NULL) - assert(!err_occurred); - else - assert(err_occurred); -#endif - if (result == NULL) { if (!err_occurred) { if (func) @@ -2100,7 +2090,7 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where) PyErr_Format(PyExc_SystemError, "%s returned NULL without setting an error", where); - return NULL; + goto error; } } else { @@ -2119,10 +2109,17 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where) "%s returned a result with an error set", where); _PyErr_ChainExceptions(exc, val, tb); - return NULL; + goto error; } } return result; + +error: +#ifdef Py_DEBUG + /* Ensure that the bug is catched in debug mode */ + Py_FatalError("Function result is invalid"); +#endif + return NULL; } PyObject * |