traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36856: Handle possible overflow in faulthandler_stack_overflow (GH-13205)

This commit is contained in:
Xi Ruoyao 2019-05-12 01:13:23 +08:00 committed by Victor Stinner
parent 79972f1fad
commit 6236c9823e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/faulthandler.c
View File

@ -1121,13 +1121,26 @@ faulthandler_stack_overflow(PyObject *self, PyObject *Py_UNUSED(ignored))
{
size_t depth, size;
uintptr_t sp = (uintptr_t)&depth;
uintptr_t stop;
uintptr_t stop, lower_limit, upper_limit;
faulthandler_suppress_crash_report();
depth = 0;
stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,
sp + STACK_OVERFLOW_MAX_SIZE,
&depth);
if (STACK_OVERFLOW_MAX_SIZE <= sp) {
lower_limit = sp - STACK_OVERFLOW_MAX_SIZE;
}
else {
lower_limit = 0;
}
if (UINTPTR_MAX - STACK_OVERFLOW_MAX_SIZE >= sp) {
upper_limit = sp + STACK_OVERFLOW_MAX_SIZE;
}
else {
upper_limit = UINTPTR_MAX;
}
stop = stack_overflow(lower_limit, upper_limit, &depth);
if (sp < stop)
size = stop - sp;
else