]> granicus.if.org Git - gc/commitdiff
Eliminate 'ptr arithmetic with NULL' cppcheck warning in alloc_mark_stack
authorIvan Maidanski <ivmai@mail.ru>
Tue, 10 Jul 2018 21:41:33 +0000 (00:41 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Wed, 11 Jul 2018 08:53:06 +0000 (11:53 +0300)
* mark.c (alloc_mark_stack): Wrap GC_mark_stack_limit (and
GC_mark_stack, GC_mark_stack_size) assignment into "else" block (after
EXIT).

mark.c

diff --git a/mark.c b/mark.c
index 3ca2841f6080f024c45c47bb68d1ca53a6a2084f..bf28a8ad2fffd024f6cbd5c9eb48ad2fe3c39284 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -1298,11 +1298,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;