Issue #18408: add more assertions on PyErr_Occurred() in ceval.c to detect bugs

vstinner · vstinner · commit f243ee4055c8 · 2013-07-16T01:02:12.000+02:00
earlier
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2111,8 +2111,7 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
                 "NULL result without error in PyObject_Call");
         }
 #else
-        if (result == NULL)
-            assert(PyErr_Occurred());
+        assert(result != NULL || PyErr_Occurred());
 #endif
         return result;
     }
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4216,6 +4216,8 @@ call_function(PyObject ***pp_stack, int oparg
         READ_TIMESTAMP(*pintr1);
         Py_DECREF(func);
     }
+    assert((x != NULL && !PyErr_Occurred())
+           || (x == NULL && PyErr_Occurred()));
 
     /* Clear the stack of the function object.  Also removes
        the arguments in case they weren't consumed already
@@ -4509,6 +4511,8 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk)
     Py_XDECREF(callargs);
     Py_XDECREF(kwdict);
     Py_XDECREF(stararg);
+    assert((result != NULL && !PyErr_Occurred())
+           || (result == NULL && PyErr_Occurred()));
     return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2111,8 +2111,7 @@ PyObject_Call(PyObject func, PyObject arg, PyObject *kw)`
`2111`	`2111`	`"NULL result without error in PyObject_Call");`
`2112`	`2112`	`}`
`2113`	`2113`	`#else`
`2114`		`- if (result == NULL)`
`2115`		`- assert(PyErr_Occurred());`
	`2114`	`+ assert(result != NULL \|\| PyErr_Occurred());`
`2116`	`2115`	`#endif`
`2117`	`2116`	`return result;`
`2118`	`2117`	`}`