#3996: On Windows, PyOS_CheckStack is supposed to protect the interpreter from

amaury.forgeotdarc · amaury.forgeotdarc · commit af04d3fa0e76 · 2008-11-22T20:01:18.000Z
stack overflow. But doing this, it always crashes when the stack is nearly full. Reviewed by Martin von Loewis. Will backport to 2.6. git-svn-id: http://svn.python.org/projects/python/trunk@67343 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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
@@ -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!");
 		}

Original file line number	Diff line number	Diff line change
`@@ -1755,7 +1755,7 @@ PyOS_CheckStack(void)`
`1755`	`1755`	`EXCEPTION_EXECUTE_HANDLER :`
`1756`	`1756`	`EXCEPTION_CONTINUE_SEARCH) {`
`1757`	`1757`	`int errcode = _resetstkoflw();`
`1758`		`- if (errcode)`
	`1758`	`+ if (errcode == 0)`
`1759`	`1759`	`{`
`1760`	`1760`	`Py_FatalError("Could not reset the stack!");`
`1761`	`1761`	`}`