Prevent a NULL pointer from being pushed onto the stack.

jeremyhylton · jeremyhylton · commit c63148928914 · 2001-09-26T19:24:45.000Z
It's possible for PyErr_NormalizeException() to set the traceback
pointer to NULL.  I'm not sure how to provoke this directly from
Python, although it may be possible.  The error occurs when an
exception is set using PyErr_SetObject() and another exception occurs
while PyErr_NormalizeException() is creating the exception instance.

XXX As a result of this change, it's possible for an exception to
occur but sys.last_traceback to be left undefined.  Not sure if this
is a problem.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2255,7 +2255,11 @@ eval_frame(PyFrameObject *f)
 						set_exc_info(tstate,
 							     exc, val, tb);
 					}
-					PUSH(tb);
+					if (tb == NULL) {
+						Py_INCREF(Py_None);
+						PUSH(Py_None);
+					} else
+						PUSH(tb);
 					PUSH(val);
 					PUSH(exc);
 				}

Original file line number	Diff line number	Diff line change
`@@ -2255,7 +2255,11 @@ eval_frame(PyFrameObject *f)`
`2255`	`2255`	`set_exc_info(tstate,`
`2256`	`2256`	`exc, val, tb);`
`2257`	`2257`	`}`
`2258`		`- PUSH(tb);`
	`2258`	`+ if (tb == NULL) {`
	`2259`	`+ Py_INCREF(Py_None);`
	`2260`	`+ PUSH(Py_None);`
	`2261`	`+ } else`
	`2262`	`+ PUSH(tb);`
`2259`	`2263`	`PUSH(val);`
`2260`	`2264`	`PUSH(exc);`
`2261`	`2265`	`}`