mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-98925: Lower marshal recursion depth for WASI (GH-98938)

Browse source 
For wasmtime 2.0, the stack depth cost is 6% higher. This causes the default max `marshal` recursion depth to blow the stack.

As the default marshal depth is 2000 and Windows is set to 1000, split the difference and choose 1500 for WASI to be safe.
This commit is contained in:
Brett Cannon 2022-11-01 15:51:05 -07:00 • committed by GitHub
parent c0859743d9
commit 9711265182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -116,6 +116,7 @@ PCbuild/win32/
Tools/unicode/data/ Tools/unicode/data/
/autom4te.cache /autom4te.cache
/build/ /build/
/builddir/
/config.cache /config.cache
/config.log /config.log
/config.status /config.status

2
Lib/test/test_marshal.py
View file

@ -260,6 +260,8 @@ class BugsTestCase(unittest.TestCase):
#if os.name == 'nt' and support.Py_DEBUG: #if os.name == 'nt' and support.Py_DEBUG:
if os.name == 'nt': if os.name == 'nt':
MAX_MARSHAL_STACK_DEPTH = 1000 MAX_MARSHAL_STACK_DEPTH = 1000
elif sys.platform == 'wasi':
MAX_MARSHAL_STACK_DEPTH = 1500
else: else:
MAX_MARSHAL_STACK_DEPTH = 2000 MAX_MARSHAL_STACK_DEPTH = 2000
for i in range(MAX_MARSHAL_STACK_DEPTH - 2): for i in range(MAX_MARSHAL_STACK_DEPTH - 2):

2
Misc/NEWS.d/next/Core and Builtins/2022-10-31-18-03-10.gh-issue-98925.zpdjVd.rst Normal file
View file

@ -0,0 +1,2 @@
Lower the recursion depth for marshal on WASI to support (in-development)
wasmtime 2.0.

2
Python/marshal.c
View file

@ -34,6 +34,8 @@ module marshal
*/ */
#if defined(MS_WINDOWS) #if defined(MS_WINDOWS)
#define MAX_MARSHAL_STACK_DEPTH 1000 #define MAX_MARSHAL_STACK_DEPTH 1000
#elif defined(__wasi__)
#define MAX_MARSHAL_STACK_DEPTH 1500
#else #else
#define MAX_MARSHAL_STACK_DEPTH 2000 #define MAX_MARSHAL_STACK_DEPTH 2000
#endif #endif