From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 29 Jun 2003 14:48:32 +0000 (+0000)
Subject: Fix SF #762455, segfault when sys.stdout is changed in getattr
X-Git-Tag: v2.3c1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5131bc256dd26eb7d46ec5774a0a42915fac838;p=python

Fix SF #762455, segfault when sys.stdout is changed in getattr
Will backport.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 07862d0efe..035520a593 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1501,6 +1501,11 @@ eval_frame(PyFrameObject *f)
 					err = -1;
 				}
 			}
+			/* PyFile_SoftSpace() can exececute arbitrary code
+			   if sys.stdout is an instance with a __getattr__.
+			   If __getattr__ raises an exception, w will
+			   be freed, so we need to prevent that temporarily. */
+			Py_XINCREF(w);
 			if (w != NULL && PyFile_SoftSpace(w, 0))
 				err = PyFile_WriteString(" ", w);
 			if (err == 0)
@@ -1528,6 +1533,7 @@ eval_frame(PyFrameObject *f)
 			    else
 			    	PyFile_SoftSpace(w, 1);
 			}
+			Py_XDECREF(w);
 			Py_DECREF(v);
 			Py_XDECREF(stream);
 			stream = NULL;