mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-20 15:40:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 67343 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67343 | amaury.forgeotdarc | 2008-11-22 21:01:18 +0100 (sam., 22 nov. 2008) | 5 lines

  #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.
........
This commit is contained in:
Amaury Forgeot d'Arc 2008-11-22 20:06:51 +00:00
parent 71ce9e7ba4
commit 74b458ceb2
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -12,6 +12,10 @@ What's New in Python 2.6.1 alpha 1
Core and Builtins 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 - Issue #4367: Python would segfault during compiling when the unicodedata
module couldn't be imported and \N escapes were present. module couldn't be imported and \N escapes were present.

2
Python/pythonrun.c
View file

@ -1755,7 +1755,7 @@ PyOS_CheckStack(void)
EXCEPTION_EXECUTE_HANDLER : EXCEPTION_EXECUTE_HANDLER :
EXCEPTION_CONTINUE_SEARCH) { EXCEPTION_CONTINUE_SEARCH) {
int errcode = _resetstkoflw(); int errcode = _resetstkoflw();
if (errcode) if (errcode == 0)
{ {
Py_FatalError("Could not reset the stack!"); Py_FatalError("Could not reset the stack!");
} }