Mercurial > cpython-lru_cache-weakref

diff Python/ceval.c @ 5557:4329e4077cf3 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Plug leak of stack frame object in exception handling code. Also delay DECREF calls until after the structures have been updated (for reentrancy awareness).
author Guido van Rossum <guido@python.org>
date Tue, 20 May 1997 17:06:11 +0000
parents 34509c05266f
children 495fbde64a73
line wrap: on
line diff
--- a/Python/ceval.c	Tue May 20 16:00:07 1997 +0000
+++ b/Python/ceval.c	Tue May 20 17:06:11 1997 +0000
@@ -1755,31 +1755,41 @@
 	PyObject *tb;
 {
 	PyFrameObject *frame;
+	PyObject *tmp_type, *tmp_value, *tmp_tb;
 	frame = tstate->frame;
 	if (frame->f_exc_type == NULL) {
 		/* This frame didn't catch an exception before */
 		/* Save previous exception of this thread in this frame */
-		Py_XDECREF(frame->f_exc_type);
-		Py_XDECREF(frame->f_exc_value);
-		Py_XDECREF(frame->f_exc_traceback);
 		if (tstate->exc_type == NULL) {
 			Py_INCREF(Py_None);
 			tstate->exc_type = Py_None;
 		}
+		tmp_type = frame->f_exc_type;
+		tmp_value = frame->f_exc_value;
+		tmp_tb = frame->f_exc_traceback;
 		Py_XINCREF(tstate->exc_type);
 		Py_XINCREF(tstate->exc_value);
 		Py_XINCREF(tstate->exc_traceback);
 		frame->f_exc_type = tstate->exc_type;
 		frame->f_exc_value = tstate->exc_value;
 		frame->f_exc_traceback = tstate->exc_traceback;
+		Py_XDECREF(tmp_type);
+		Py_XDECREF(tmp_value);
+		Py_XDECREF(tmp_tb);
 	}
 	/* Set new exception for this thread */
+	tmp_type = tstate->exc_type;
+	tmp_value = tstate->exc_value;
+	tmp_tb = tstate->exc_traceback;
 	Py_XINCREF(type);
 	Py_XINCREF(value);
 	Py_XINCREF(tb);
 	tstate->exc_type = type;
 	tstate->exc_value = value;
 	tstate->exc_traceback = tb;
+	Py_XDECREF(tmp_type);
+	Py_XDECREF(tmp_value);
+	Py_XDECREF(tmp_tb);
 	/* For b/w compatibility */
 	PySys_SetObject("exc_type", type);
 	PySys_SetObject("exc_value", value);
@@ -1791,29 +1801,36 @@
 	PyThreadState *tstate;
 {
 	PyFrameObject *frame;
+	PyObject *tmp_type, *tmp_value, *tmp_tb;
 	frame = tstate->frame;
 	if (frame->f_exc_type != NULL) {
 		/* This frame caught an exception */
-		Py_XDECREF(tstate->exc_type);
-		Py_XDECREF(tstate->exc_value);
-		Py_XDECREF(tstate->exc_traceback);
+		tmp_type = tstate->exc_type;
+		tmp_value = tstate->exc_value;
+		tmp_tb = tstate->exc_traceback;
 		Py_XINCREF(frame->f_exc_type);
 		Py_XINCREF(frame->f_exc_value);
 		Py_XINCREF(frame->f_exc_traceback);
 		tstate->exc_type = frame->f_exc_type;
 		tstate->exc_value = frame->f_exc_value;
 		tstate->exc_traceback = frame->f_exc_traceback;
+		Py_XDECREF(tmp_type);
+		Py_XDECREF(tmp_value);
+		Py_XDECREF(tmp_tb);
 		/* For b/w compatibility */
 		PySys_SetObject("exc_type", frame->f_exc_type);
 		PySys_SetObject("exc_value", frame->f_exc_value);
 		PySys_SetObject("exc_traceback", frame->f_exc_traceback);
 	}
-	Py_XDECREF(frame->f_exc_type);
-	Py_XDECREF(frame->f_exc_value);
-	Py_XDECREF(frame->f_exc_traceback);
+	tmp_type = frame->f_exc_type;
+	tmp_value = frame->f_exc_value;
+	tmp_tb = frame->f_exc_traceback;
 	frame->f_exc_type = NULL;
 	frame->f_exc_value = NULL;
 	frame->f_exc_traceback = NULL;
+	Py_XDECREF(tmp_type);
+	Py_XDECREF(tmp_value);
+	Py_XDECREF(tmp_tb);
 }
 
 /* Logic for the raise statement (too complicated for inlining).