From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sat, 22 Nov 2008 20:01:18 +0000 (+0000)
Subject: #3996: On Windows, PyOS_CheckStack is supposed to protect the interpreter from
X-Git-Tag: v2.7a1~2634
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc61901dd2b1bcb5467ebc36ef35a51106d9b103;p=python

#3996: On Windows, PyOS_CheckStack is supposed to protect the interpreter from
stack overflow. But doing this, it always crashes when the stack is nearly full.

Reviewed by Martin von Loewis. Will backport to 2.6.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index c3f0ec61e1..b7e80a9d2d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.7 alpha 1
 Core and Builtins
 -----------------
 
+- Issue #3996: On Windows, the PyOS_CheckStack function would cause the
+  interpreter to abort ("Fatal Python error: Could not reset the stack!")
+  instead of throwing a MemoryError.
+
 - Issue #4367: Python would segfault during compiling when the unicodedata
   module couldn't be imported and \N escapes were present.
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4ff70d8543..54f3c5784b 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1755,7 +1755,7 @@ PyOS_CheckStack(void)
 		        EXCEPTION_EXECUTE_HANDLER : 
 		        EXCEPTION_CONTINUE_SEARCH) {
 		int errcode = _resetstkoflw();
-		if (errcode)
+		if (errcode == 0)
 		{
 			Py_FatalError("Could not reset the stack!");
 		}