Fixed bugs noted by Greg Stein

Moshe Zadka · Moshe Zadka · commit f5df3834eb83 · 2001-01-11T11:55:37.000Z
* x wasn't initialized to NULL
* Did not DECREF result from displayhook function
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1250,6 +1250,7 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
 				PyErr_SetString(PyExc_RuntimeError,
 						"lost sys.displayhook");
 				err = -1;
+				x = NULL;
 			}
 			if (err == 0) {
 				x = Py_BuildValue("(O)", v);
@@ -1258,6 +1259,7 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
 			}
 			if (err == 0) {
 				w = PyEval_CallObject(w, x);
+				Py_XDECREF(w);
 				if (w == NULL)
 					err = -1;
 			}

Original file line number	Diff line number	Diff line change
`@@ -1250,6 +1250,7 @@ eval_code2(PyCodeObject co, PyObject globals, PyObject *locals,`
`1250`	`1250`	`PyErr_SetString(PyExc_RuntimeError,`
`1251`	`1251`	`"lost sys.displayhook");`
`1252`	`1252`	`err = -1;`
	`1253`	`+ x = NULL;`
`1253`	`1254`	`}`
`1254`	`1255`	`if (err == 0) {`
`1255`	`1256`	`x = Py_BuildValue("(O)", v);`
`@@ -1258,6 +1259,7 @@ eval_code2(PyCodeObject co, PyObject globals, PyObject *locals,`
`1258`	`1259`	`}`
`1259`	`1260`	`if (err == 0) {`
`1260`	`1261`	`w = PyEval_CallObject(w, x);`
	`1262`	`+ Py_XDECREF(w);`
`1261`	`1263`	`if (w == NULL)`
`1262`	`1264`	`err = -1;`
`1263`	`1265`	`}`