Mercurial > cpython-lru_cache-weakref

diff Python/errors.c @ 28572:faeb708bacc4 2.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backport: PyErr_NormalizeException(): in the type==NULL test, we should simply return. Setting an exception can mess with the exception state, and continuing is definitely wrong (since type is dereferenced later on). Some code that calls this seems to be prepared for a NULL exception type, so let's be safe rather than sorry and simply assume there's nothing to normalize in this case.
author Guido van Rossum <guido@python.org>
date Thu, 10 Apr 2003 20:30:18 +0000
parents d4406fbfcb4e
children
line wrap: on
line diff
--- a/Python/errors.c	Wed Apr 09 18:19:24 2003 +0000
+++ b/Python/errors.c	Thu Apr 10 20:30:18 2003 +0000
@@ -131,9 +131,8 @@
 	PyObject *initial_tb = NULL;
 
 	if (type == NULL) {
-		/* This is a bug.  Should never happen.  Don't dump core. */
-		PyErr_SetString(PyExc_SystemError,
-			"PyErr_NormalizeException() called without exception");
+		/* There was no exception, so nothing to do. */
+		return;
 	}
 
 	/* If PyErr_SetNone() was used, the value will have been actually