File 1191-erts-Fix-stack-validation-when-frame-point... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1191-erts-Fix-stack-validation-when-frame-pointers-are-en.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Currently displaying revision f11a8876faa0a8240b9c8df85bc35eb2 , Show latest

From 8bad4b44185d47d9ac8243ade693402c18817628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 10 Aug 2021 11:48:09 +0200
Subject: [PATCH 1/3] erts: Fix stack validation when frame pointers are
 enabled

---
 erts/emulator/beam/erl_gc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index eae8d7d5d2..596ce8bfb9 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -3738,8 +3738,10 @@ void erts_validate_stack(Process *p, Eterm *frame_ptr, Eterm *stack_top) {
         return;
     }
 
-    ASSERT(next_fp);
-    do {
+    /* We must have a frame pointer or an empty stack, but not both. */
+    ASSERT((next_fp != NULL) ^ (stack_top == stack_bottom));
+
+    while (next_fp) {
         ASSERT(next_fp >= stack_top && next_fp <= stack_bottom);
 
         /* We may not skip any frames. */
@@ -3765,7 +3767,7 @@ void erts_validate_stack(Process *p, Eterm *frame_ptr, Eterm *stack_top) {
         }
 
         scanner += CP_SIZE;
-    } while(next_fp);
+    }
 }
 #endif
 
-- 
2.31.1

Places

File 1191-erts-Fix-stack-validation-when-frame-pointers-are-en.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Places