[Oops, I forgot half of the patch.]

Patch # 1050 by Amaury Forgeot d'Arc.
On Windows, debug builds insert stack probes, and recursive functions
tend to exhaust the stack faster.
This patch reduces the marshal maximum depth from 2000 to 1500 for debug
builds only. Optimized builds are not affected.
This allows test_marshal to pass with debug builds.

diff --git a/Python/marshal.c b/Python/marshal.c
index c5952b2b561c49d92321aac884387209c037f8f4..1ec33bd81757230744dd0f48ebfd0f193c13282a 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -14,8 +14,13 @@
 /* High water mark to determine when the marshalled object is dangerously deep
  * and risks coring the interpreter.  When the object stack gets this deep,
  * raise an exception instead of continuing.
+ * On Windows debug builds, reduce this value.
  */
+#if defined(MS_WINDOWS) && defined(_DEBUG)
+#define MAX_MARSHAL_STACK_DEPTH 1500
+#else
 #define MAX_MARSHAL_STACK_DEPTH 2000
+#endif
 
 #define TYPE_NULL              '0'
 #define TYPE_NONE              'N'