summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2014-11-01 22:15:16 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2014-11-01 22:15:16 (GMT)
commitf6c69e6cc9aac35564a2a2a7ecc43fa8db6da975 (patch)
tree5e8d1c25246d54ecd408f41594395f8285cb7093
parent53683965aaf2895fbdb851e07436c6f86b48d0dc (diff)
downloadcpython-f6c69e6cc9aac35564a2a2a7ecc43fa8db6da975.zip
cpython-f6c69e6cc9aac35564a2a2a7ecc43fa8db6da975.tar.gz
cpython-f6c69e6cc9aac35564a2a2a7ecc43fa8db6da975.tar.bz2
#22734 marshal needs a lower stack depth for debug builds on Windows
-rw-r--r--Lib/test/test_marshal.py2
-rw-r--r--Python/marshal.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index 068c471..d2d6b48 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 ca64be3..837aa48 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