From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 10 Jul 2018 21:41:33 +0000 (+0300)
Subject: Eliminate 'ptr arithmetic with NULL' cppcheck warning in alloc_mark_stack
X-Git-Tag: v8.0.0~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=900d7e76317c9f07626e922ced0c39bae72d5bdb;p=gc

Eliminate 'ptr arithmetic with NULL' cppcheck warning in alloc_mark_stack

* mark.c (alloc_mark_stack): Wrap GC_mark_stack_limit (and
GC_mark_stack, GC_mark_stack_size) assignment into "else" block (after
EXIT).
---

diff --git a/mark.c b/mark.c
index 95dab2a0..a49e9d93 100644
--- a/mark.c
+++ b/mark.c
@@ -1311,11 +1311,10 @@ static void alloc_mark_stack(size_t n)
         } else {
           WARN("Failed to grow mark stack to %" WARN_PRIdPTR " frames\n", n);
         }
+    } else if (NULL == new_stack) {
+        GC_err_printf("No space for mark stack\n");
+        EXIT();
     } else {
-        if (new_stack == 0) {
-            GC_err_printf("No space for mark stack\n");
-            EXIT();
-        }
         GC_mark_stack = new_stack;
         GC_mark_stack_size = n;
         GC_mark_stack_limit = new_stack + n;