From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 5 Apr 2018 21:42:29 +0000 (+0300)
Subject: Eliminate 'there is pointer arithmetic with NULL' cppcheck warning
X-Git-Tag: v7.6.6~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c86cda70c064bbbd2f42eb98e240165cdb8e58b;p=gc

Eliminate 'there is pointer arithmetic with NULL' cppcheck warning

* extra/msvc_dbg.c (GetDescriptionFromStack): Compare size to 0 instead
of comparing description to NULL; mark format argument as used.
* extra/msvc_dbg.c (backtrace_symbols): Do not call
GetDescriptionFromStack if symbols (description) is NULL but size is
non-zero.
---

diff --git a/extra/msvc_dbg.c b/extra/msvc_dbg.c
index 42aceeb2..8abe2473 100644
--- a/extra/msvc_dbg.c
+++ b/extra/msvc_dbg.c
@@ -353,12 +353,15 @@ size_t GetDescriptionFromStack(void* const frames[], size_t count,
   char*const end = begin + size;
   char* buffer = begin + (count + 1) * sizeof(char*);
   size_t i;
+  (void)format;
   for (i = 0; i < count; ++i) {
-    if (description) description[i] = buffer;
+    if (size)
+      description[i] = buffer;
     size = (GC_ULONG_PTR)end < (GC_ULONG_PTR)buffer ? 0 : end - buffer;
     buffer += 1 + GetDescriptionFromAddress(frames[i], NULL, buffer, size);
   }
-  if (description) description[count] = NULL;
+  if (size)
+    description[count] = NULL;
   return buffer - begin;
 }
 
@@ -373,7 +376,8 @@ char** backtrace_symbols(void*const* addresses, int count)
 {
   size_t size = GetDescriptionFromStack(addresses, count, NULL, NULL, 0);
   char** symbols = (char**)malloc(size);
-  GetDescriptionFromStack(addresses, count, NULL, symbols, size);
+  if (symbols != NULL)
+    GetDescriptionFromStack(addresses, count, NULL, symbols, size);
   return symbols;
 }