summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-07-07 00:49:07 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-07-07 00:49:07 (GMT)
commit24e33acf8c422f6b8f84387242ff7874012f7291 (patch)
tree0b52a2c6c9f16863d069726c2a45e4654699ae6c
parent0507bf56f0b1064a179464eb3a9d524fd6dad815 (diff)
downloadcpython-24e33acf8c422f6b8f84387242ff7874012f7291.zip
cpython-24e33acf8c422f6b8f84387242ff7874012f7291.tar.gz
cpython-24e33acf8c422f6b8f84387242ff7874012f7291.tar.bz2
Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix
a stack overflow in the marshal module (fix a crash in test_marshal). Patch written by Jeremy Kloth.
-rw-r--r--Misc/NEWS4
-rw-r--r--PCbuild/python.vcxproj2
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index cd890af..c3fbcb9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
+- Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix
+ a stack overflow in the marshal module (fix a crash in test_marshal).
+ Patch written by Jeremy Kloth.
+
- Issue #3329: Implement the PEP 445: Add new APIs to customize Python memory
allocators.
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index e1d05e5..bd12624 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -243,7 +243,7 @@
<Link>
<OutputFile>$(OutDir)python_d.exe</OutputFile>
<SubSystem>Console</SubSystem>
- <StackReserveSize>2100000</StackReserveSize>
+ <StackReserveSize>4194304</StackReserveSize>
<BaseAddress>0x1d000000</BaseAddress>
</Link>
</ItemDefinitionGroup>