From: Victor Stinner <victor.stinner@gmail.com>
Date: Sun, 7 Jul 2013 00:49:07 +0000 (+0200)
Subject: Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix
X-Git-Tag: v3.4.0a1~314^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24e33acf8c422f6b8f84387242ff7874012f7291;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index cd890af280d5..c3fbcb96576c 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 e1d05e5e50ad..bd1262459636 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>