commit 6236c9823ef3e8e2229b0598d3d8189adf5e00f2
author Xi Ruoyao <xry111@mengyan1223.wang> Sun May 12 01:13:23 2019 +0800
committer Victor Stinner <vstinner@redhat.com> Sat May 11 19:13:23 2019 +0200
tree 58f1ac8948e1e237b4f88b776da91b75512d4166
parent 79972f1fad5247ade34ef98ad987162a9a78401d

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

Modules/faulthandler.c

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index d45b866..63a9b91 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1121,13 +1121,26 @@
 {
     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