Fix null pointer dereference on out-of-memory in tests

(Apply commit 9c6d1b3 from 'master' branch.)

* tests/disclaim_bench.c (main): Check GC_MALLOC result for NULL
(abort in case of out-of-memory) before dereference.
* tests/test.c (run_one_test): Likewise.

diff --git a/tests/disclaim_bench.c b/tests/disclaim_bench.c
index 5159829ce92c99f045b6096e365dad76a31d86c1..cf31a4a5aaa18036acd0ef92955d53db6ee841a9 100644 (file)
--- a/tests/disclaim_bench.c
+++ b/tests/disclaim_bench.c
@@ -91,9 +91,6 @@ int main(int argc, char **argv)
 
     GC_INIT();
     GC_init_finalized_malloc();
-
-    keep_arr = GC_MALLOC(sizeof(void *)*KEEP_CNT);
-
     if (argc == 2 && strcmp(argv[1], "--help") == 0) {
         fprintf(stderr,
                 "Usage: %s [FINALIZATION_MODEL]\n"
@@ -112,6 +109,12 @@ int main(int argc, char **argv)
         model_max = 2;
     }
 
+    keep_arr = GC_MALLOC(sizeof(void *) * KEEP_CNT);
+    if (NULL == keep_arr) {
+        fprintf(stderr, "Out of memory!\n");
+        exit(3);
+    }
+
     printf("\t\t\tfin. ratio       time/s    time/fin.\n");
     for (model = model_min; model <= model_max; ++model) {
         double t = 0.0;

diff --git a/tests/test.c b/tests/test.c
index 9f3afa4a0eee7419fcbd4cc4fe2e84dabd32a09f..4c1cc7fccdd46f3da1b19b9e41ea7dceff56d761 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1222,6 +1222,7 @@ void run_one_test(void)
         FAIL;
       }
       z = GC_malloc(8);
+      CHECK_OUT_OF_MEMORY(z);
       GC_PTR_STORE(z, x);
       if (*z != x) {
         GC_printf("GC_PTR_STORE failed: %p != %p\n", (void *)(*z), (void *)x);