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

Issue #23433: Fix faulthandler._stack_overflow() 

Fix undefined behaviour: don't compare pointers. Use Py_uintptr_t type instead
of void*. It fixes test_faulthandler on Fedora 22 which now uses GCC 5.
This commit is contained in:
Victor Stinner 2015-02-11 14:23:35 +01:00
parent 8e36812e27
commit 7a5567a92c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/faulthandler.c
View File

@ -911,12 +911,12 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args)
} }
#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
static void* static Py_uintptr_t
stack_overflow(void *min_sp, void *max_sp, size_t *depth) stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth)
{ {
/* allocate 4096 bytes on the stack at each call */ /* allocate 4096 bytes on the stack at each call */
unsigned char buffer[4096]; unsigned char buffer[4096];
void *sp = &buffer; Py_uintptr_t sp = (Py_uintptr_t)&buffer;
*depth += 1; *depth += 1;
if (sp < min_sp || max_sp < sp) if (sp < min_sp || max_sp < sp)
return sp; return sp;
@ -929,7 +929,8 @@ static PyObject *
faulthandler_stack_overflow(PyObject *self) faulthandler_stack_overflow(PyObject *self)
{ {
size_t depth, size; size_t depth, size;
char *sp = (char *)&depth, *stop; Py_uintptr_t sp = (Py_uintptr_t)&depth;
Py_uintptr_t stop;
depth = 0; depth = 0;
stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE, stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,