summaryrefslogtreecommitdiff
blob: 80afbd1c47bbb11fdde89dbaae101277ac4106de (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
changeset:   94583:689092296ad3
branch:      3.4
parent:      94579:645f3d750be1
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Feb 11 14:23:35 2015 +0100
summary:     Issue #23433: Fix faulthandler._stack_overflow()

diff -r 645f3d750be1 -r 689092296ad3 Modules/faulthandler.c
--- a/Modules/faulthandler.c	Tue Feb 10 14:49:32 2015 +0100
+++ b/Modules/faulthandler.c	Wed Feb 11 14:23:35 2015 +0100
@@ -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,