From: Chris Hall <chris.hall.list.highwayman.com>
Date: Fri, 23 Jul 2010 18:27:11 +0000 (-0700)
Subject: lib: Fix accounting of memory
X-Git-Tag: frr-2.0-rc1~2111
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cca85d27a59c31e1b20e4c4adc7d9bb57606e584;p=mirror%2Ffrr.git

lib: Fix accounting of memory

* lib/memory.c: (zrealloc) If is called with NULL pointer then it should
  increment allocations because it behaves the same as zmalloc.

  (zfree) is called with NULL pointer, it does nothing therefore allocation
  count should not change.
---

diff --git a/lib/memory.c b/lib/memory.c
index 4bac31dbb4..4090fd901f 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -111,6 +111,9 @@ zrealloc (int type, void *ptr, size_t size)
   memory = realloc (ptr, size);
   if (memory == NULL)
     zerror ("realloc", type, size);
+  if (ptr == NULL)
+    alloc_inc (type);
+
   return memory;
 }
 
@@ -123,8 +126,11 @@ zrealloc (int type, void *ptr, size_t size)
 void
 zfree (int type, void *ptr)
 {
-  alloc_dec (type);
-  free (ptr);
+  if (ptr != NULL)
+    {
+      alloc_dec (type);
+      free (ptr);
+    }
 }
 
 /*