From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 1 Nov 2014 22:15:16 +0000 (-0700)
Subject: #22734 marshal needs a lower stack depth for debug builds on Windows
X-Git-Tag: v3.5.0a1~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6c69e6cc9aac35564a2a2a7ecc43fa8db6da975;p=thirdparty%2FPython%2Fcpython.git

#22734 marshal needs a lower stack depth for debug builds on Windows
---

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index 068c4713e182..d2d6b4871480 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -188,7 +188,7 @@ class BugsTestCase(unittest.TestCase):
         head = last = []
         # The max stack depth should match the value in Python/marshal.c.
         if os.name == 'nt' and hasattr(sys, 'gettotalrefcount'):
-            MAX_MARSHAL_STACK_DEPTH = 1500
+            MAX_MARSHAL_STACK_DEPTH = 1000
         else:
             MAX_MARSHAL_STACK_DEPTH = 2000
         for i in range(MAX_MARSHAL_STACK_DEPTH - 2):
diff --git a/Python/marshal.c b/Python/marshal.c
index ca64be394821..837aa4812c76 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -19,7 +19,7 @@
  * On Windows debug builds, reduce this value.
  */
 #if defined(MS_WINDOWS) && defined(_DEBUG)
-#define MAX_MARSHAL_STACK_DEPTH 1500
+#define MAX_MARSHAL_STACK_DEPTH 1000
 #else
 #define MAX_MARSHAL_STACK_DEPTH 2000
 #endif