mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
GH-91079: Implement C stack limits using addresses, not counters. (GH-130007)
* Implement C recursion protection with limit pointers * 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
c637bce20a
commit
2498c22fa0
47 changed files with 1217 additions and 1463 deletions
|
@ -1528,12 +1528,8 @@ _Py_SourceAsString(PyObject *cmd, const char *funcname, const char *what, PyComp
|
|||
}
|
||||
|
||||
#if defined(USE_STACKCHECK)
|
||||
#if defined(WIN32) && defined(_MSC_VER)
|
||||
|
||||
/* Stack checking for Microsoft C */
|
||||
|
||||
#include <malloc.h>
|
||||
#include <excpt.h>
|
||||
/* Stack checking */
|
||||
|
||||
/*
|
||||
* Return non-zero when we run out of memory on the stack; zero otherwise.
|
||||
|
@ -1541,27 +1537,10 @@ _Py_SourceAsString(PyObject *cmd, const char *funcname, const char *what, PyComp
|
|||
int
|
||||
PyOS_CheckStack(void)
|
||||
{
|
||||
__try {
|
||||
/* alloca throws a stack overflow exception if there's
|
||||
not enough space left on the stack */
|
||||
alloca(PYOS_STACK_MARGIN * sizeof(void*));
|
||||
return 0;
|
||||
} __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
|
||||
EXCEPTION_EXECUTE_HANDLER :
|
||||
EXCEPTION_CONTINUE_SEARCH) {
|
||||
int errcode = _resetstkoflw();
|
||||
if (errcode == 0)
|
||||
{
|
||||
Py_FatalError("Could not reset the stack!");
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
PyThreadState *tstate = _PyThreadState_GET();
|
||||
return _Py_ReachedRecursionLimit(tstate);
|
||||
}
|
||||
|
||||
#endif /* WIN32 && _MSC_VER */
|
||||
|
||||
/* Alternate implementations can be added here... */
|
||||
|
||||
#endif /* USE_STACKCHECK */
|
||||
|
||||
/* Deprecated C API functions still provided for binary compatibility */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue