mirror of
https://github.com/python/cpython.git
synced 2025-07-08 03:45:36 +00:00
GH-130396: Use computed stack limits on linux (GH-130398)
* Implement C recursion protection with limit pointers for Linux, MacOS and Windows * Remove calls to PyOS_CheckStack * Add stack protection to parser * Make tests more robust to low stacks * Improve error messages for stack overflow
This commit is contained in:
parent
99088ab081
commit
014223649c
58 changed files with 1295 additions and 1482 deletions
|
@ -21,14 +21,23 @@ PyAPI_FUNC(void) PyErr_DisplayException(PyObject *);
|
|||
/* Stuff with no proper home (yet) */
|
||||
PyAPI_DATA(int) (*PyOS_InputHook)(void);
|
||||
|
||||
/* Stack size, in "pointers" (so we get extra safety margins
|
||||
on 64-bit platforms). On a 32-bit platform, this translates
|
||||
to an 8k margin. */
|
||||
#define PYOS_STACK_MARGIN 2048
|
||||
/* Stack size, in "pointers". This must be large enough, so
|
||||
* no two calls to check recursion depth are more than this far
|
||||
* apart. In practice, that means it must be larger than the C
|
||||
* stack consumption of PyEval_EvalDefault */
|
||||
#if defined(_Py_ADDRESS_SANITIZER) || defined(_Py_THREAD_SANITIZER)
|
||||
# define PYOS_STACK_MARGIN 4096
|
||||
#elif defined(Py_DEBUG) && defined(WIN32)
|
||||
# define PYOS_STACK_MARGIN 3072
|
||||
#elif defined(__wasi__)
|
||||
/* Web assembly has two stacks, so this isn't really a size */
|
||||
# define PYOS_STACK_MARGIN 500
|
||||
#else
|
||||
# define PYOS_STACK_MARGIN 2048
|
||||
#endif
|
||||
#define PYOS_STACK_MARGIN_BYTES (PYOS_STACK_MARGIN * sizeof(void *))
|
||||
|
||||
#if defined(WIN32) && !defined(MS_WIN64) && !defined(_M_ARM) && defined(_MSC_VER) && _MSC_VER >= 1300
|
||||
/* Enable stack checking under Microsoft C */
|
||||
// When changing the platforms, ensure PyOS_CheckStack() docs are still correct
|
||||
#if defined(WIN32)
|
||||
#define USE_STACKCHECK
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue