From 78803b213eafe21f00b12ffc543a25335908dbc1 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 3 Jan 2023 12:09:47 +0300
Subject: Fix potential SIGSEGV on out-of-memory in gctest (a cherry-pick of
 commit b8b3712bc from 'release-8_0')

* tests/test.c (test_generic_malloc_or_special): Call
CHECK_OUT_OF_MEMORY() before GC_get_kind_and_size().
* tests/test.c [DBG_HDRS_ALL] (run_one_test): Set y to fail_proc1
right before its use; call CHECK_OUT_OF_MEMORY() before each GC_size()
invocation; call CHECK_OUT_OF_MEMORY() before GC_base().
---
 tests/test.c | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/tests/test.c b/tests/test.c
index 91db7576..03cdc47e 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -665,9 +665,11 @@ void check_marks_int_list(sexpr x)
 
 void test_generic_malloc_or_special(void *p) {
   size_t size;
-  int kind = GC_get_kind_and_size(p, &size);
+  int kind;
   void *p2;
 
+  CHECK_OUT_OF_MEMORY(p);
+  kind = GC_get_kind_and_size(p, &size);
   if (size != GC_size(p)) {
     GC_printf("GC_get_kind_and_size returned size not matching GC_size\n");
     FAIL;
@@ -1339,13 +1341,8 @@ void * GC_CALLBACK inc_int_counter(void *pcounter)
 void run_one_test(void)
 {
 #   ifndef DBG_HDRS_ALL
-        char *x;
+        char *x, *y;
         char **z;
-#       ifdef LINT
-            char *y = 0;
-#       else
-            char *y = (char *)(GC_word)fail_proc1;
-#       endif
 #   endif
     CLOCK_TYPE start_time;
     CLOCK_TYPE reverse_time;
@@ -1364,28 +1361,41 @@ void run_one_test(void)
 #   endif
     test_tinyfl();
 #   ifndef DBG_HDRS_ALL
-      AO_fetch_and_add1(&collectable_count); /* 1 */
-      AO_fetch_and_add1(&collectable_count); /* 2 */
-      AO_fetch_and_add1(&collectable_count); /* 3 */
-      if ((GC_size(GC_malloc(7)) != 8 &&
-           GC_size(GC_malloc(7)) != MIN_WORDS * sizeof(GC_word))
-           || GC_size(GC_malloc(15)) != 16) {
+      AO_fetch_and_add1(&collectable_count);
+      x = (char*)GC_malloc(7);
+      CHECK_OUT_OF_MEMORY(x);
+      AO_fetch_and_add1(&collectable_count);
+      y = (char*)GC_malloc(7);
+      CHECK_OUT_OF_MEMORY(y);
+      if (GC_size(x) != 8 && GC_size(y) != MIN_WORDS * sizeof(GC_word)) {
         GC_printf("GC_size produced unexpected results\n");
         FAIL;
       }
       AO_fetch_and_add1(&collectable_count);
-      if (GC_size(GC_malloc(0)) != MIN_WORDS * sizeof(GC_word)) {
+      x = (char*)GC_malloc(15);
+      CHECK_OUT_OF_MEMORY(x);
+      if (GC_size(x) != 16) {
+        GC_printf("GC_size produced unexpected results 2\n");
+        FAIL;
+      }
+      AO_fetch_and_add1(&collectable_count);
+      x = (char*)GC_malloc(0);
+      CHECK_OUT_OF_MEMORY(x);
+      if (GC_size(x) != MIN_WORDS * sizeof(GC_word)) {
         GC_printf("GC_malloc(0) failed: GC_size returns %lu\n",
                       (unsigned long)GC_size(GC_malloc(0)));
         FAIL;
       }
       AO_fetch_and_add1(&uncollectable_count);
-      if (GC_size(GC_malloc_uncollectable(0)) != MIN_WORDS * sizeof(GC_word)) {
+      x = (char*)GC_malloc_uncollectable(0);
+      CHECK_OUT_OF_MEMORY(x);
+      if (GC_size(x) != MIN_WORDS * sizeof(GC_word)) {
         GC_printf("GC_malloc_uncollectable(0) failed\n");
         FAIL;
       }
       AO_fetch_and_add1(&collectable_count);
       x = GC_malloc(16);
+      CHECK_OUT_OF_MEMORY(x);
       if (GC_base(GC_PTR_ADD(x, 13)) != x) {
         GC_printf("GC_base(heap ptr) produced incorrect result\n");
         FAIL;
@@ -1409,6 +1419,7 @@ void run_one_test(void)
         GC_printf("Bad INCR/DECR result\n");
         FAIL;
       }
+      y = (char *)(GC_word)fail_proc1;
 #     ifndef PCR
         if (GC_base(y) != 0) {
           GC_printf("GC_base(fn_ptr) produced incorrect result\n");
-- 
cgit v1.2.1