#3378: in case of no memory, don't leak even more memory. :)

georg.brandl · georg.brandl · commit fc80bebfc5f9 · 2008-07-19T10:08:55.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@65131 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1553,10 +1553,10 @@ err_input(perrdetail *err)
 	case E_INTR:
 		if (!PyErr_Occurred())
 			PyErr_SetNone(PyExc_KeyboardInterrupt);
-		return;
+		goto cleanup;
 	case E_NOMEM:
 		PyErr_NoMemory();
-		return;
+		goto cleanup;
 	case E_EOF:
 		msg = "unexpected EOF while parsing";
 		break;
@@ -1601,17 +1601,18 @@ err_input(perrdetail *err)
 	}
 	v = Py_BuildValue("(ziiz)", err->filename,
 			  err->lineno, err->offset, err->text);
-	if (err->text != NULL) {
-		PyObject_FREE(err->text);
-		err->text = NULL;
-	}
 	w = NULL;
 	if (v != NULL)
 		w = Py_BuildValue("(sO)", msg, v);
 	Py_XDECREF(u);
 	Py_XDECREF(v);
 	PyErr_SetObject(errtype, w);
 	Py_XDECREF(w);
+cleanup:
+	if (err->text != NULL) {
+		PyObject_FREE(err->text);
+		err->text = NULL;
+	}
 }
 
 /* Print fatal error message and abort */
