From 7a5567a92cf0e0bcaae7dca8975328c9151fe1c7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 11 Feb 2015 14:23:35 +0100 Subject: [PATCH] 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. --- Modules/faulthandler.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index c17ffd8aca5..01e7beb2550 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -911,12 +911,12 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args) } #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) -static void* -stack_overflow(void *min_sp, void *max_sp, size_t *depth) +static Py_uintptr_t +stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth) { /* allocate 4096 bytes on the stack at each call */ unsigned char buffer[4096]; - void *sp = &buffer; + Py_uintptr_t sp = (Py_uintptr_t)&buffer; *depth += 1; if (sp < min_sp || max_sp < sp) return sp; @@ -929,7 +929,8 @@ static PyObject * faulthandler_stack_overflow(PyObject *self) { size_t depth, size; - char *sp = (char *)&depth, *stop; + Py_uintptr_t sp = (Py_uintptr_t)&depth; + Py_uintptr_t stop; depth = 0; stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,