[Bf-blender-cvs] [6ab359e5252] master: Fix potential crash in guarded alloc stats, when there are no allocations

[James Fulop]

Commit: 6ab359e525204e476cfa9c772e80d37d3d2c5014
Author: James Fulop
Date:   Fri Jan 31 12:58:16 2020 +0100
Branches: master
https://developer.blender.org/rB6ab359e525204e476cfa9c772e80d37d3d2c5014

Fix potential crash in guarded alloc stats, when there are no allocations

This was found with static analysis warnings in Visual Studio 2019.

Differential Revision: https://developer.blender.org/D6564

===================================================================

M	intern/guardedalloc/intern/mallocn_guarded_impl.c

===================================================================

diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index ef74f394fb1..de2b2eee93a 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -735,8 +735,19 @@ void MEM_guarded_printmemlist_stats(void)
 
   mem_lock_thread();
 
-  /* put memory blocks into array */
-  printblock = malloc(sizeof(MemPrintBlock) * totblock);
+  if (totblock != 0) {
+    /* put memory blocks into array */
+    printblock = malloc(sizeof(MemPrintBlock) * totblock);
+
+    if (UNLIKELY(!printblock)) {
+      mem_unlock_thread();
+      print_error("malloc returned null while generating stats");
+      return;
+    }
+  }
+  else {
+    printblock = NULL;
+  }
 
   pb = printblock;
   totpb = 0;
@@ -745,7 +756,7 @@ void MEM_guarded_printmemlist_stats(void)
   if (membl)
     membl = MEMNEXT(membl);
 
-  while (membl) {
+  while (membl && pb) {
     pb->name = membl->name;
     pb->len = membl->len;
     pb->items = 1;
@@ -767,7 +778,10 @@ void MEM_guarded_printmemlist_stats(void)
   }
 
   /* sort by name and add together blocks with the same name */
-  qsort(printblock, totpb, sizeof(MemPrintBlock), compare_name);
+  if (totpb > 1) {
+    qsort(printblock, totpb, sizeof(MemPrintBlock), compare_name);
+  }
+
   for (a = 0, b = 0; a < totpb; a++) {
     if (a == b) {
       continue;
@@ -784,7 +798,10 @@ void MEM_guarded_printmemlist_stats(void)
   totpb = b + 1;
 
   /* sort by length and print */
-  qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
+  if (totpb > 1) {
+    qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
+  }
+
   printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use / (double)(1024 * 1024));
   printf("peak memory len: %.3f MB\n", (double)peak_mem / (double)(1024 * 1024));
   printf("slop memory len: %.3f MB\n", (double)mem_in_use_slop / (double)(1024 * 1024));
@@ -796,7 +813,10 @@ void MEM_guarded_printmemlist_stats(void)
            (double)pb->len / 1024.0 / (double)pb->items,
            pb->name);
   }
-  free(printblock);
+
+  if (printblock != NULL) {
+    free(printblock);
+  }
 
   mem_unlock_thread();