[Python-checkins] cpython (3.4): Issue #23433: Fix faulthandler._stack_overflow()

Wed Feb 11 14:26:06 CET 2015

https://hg.python.org/cpython/rev/689092296ad3
changeset: 94583:689092296ad3
branch: 3.4
parent: 94579:645f3d750be1
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Feb 11 14:23:35 2015 +0100
summary:
 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.
files:
 Modules/faulthandler.c | 9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -911,12 +911,12 @@
 }
 
 #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 @@
 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,
-- 
Repository URL: https://hg.python.org/cpython
