Changeset 516 for trunk/src/dnmalloc.c

Timestamp:

Oct 31, 2016, 8:31:24 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #409 and #410 (unprivileged suidcheck and gcc 6.2 compiler warnings).

File:

• trunk/src/dnmalloc.c (modified) (3 diffs)

trunk/src/dnmalloc.c

@@ -5296 +5296 @@
 {
   mstate av = get_malloc_state();
-  struct mallinfo mi;
+  static struct mallinfo mi;
   unsigned int i;
   mbinptr b;
@@ -5312 +5312 @@
   check_malloc_state();
 
+  if (!av || av->top == 0) {
+    return mi;
+  }
+  
   /* Account for top */
   avail = chunksize(av->top);
@@ -5362 +5366 @@
           (CHUNK_SIZE_T)(HASHTABLESIZE / (1024*1024)));
   fprintf(stderr, "max system bytes = %10lu\n",
-          (CHUNK_SIZE_T)(mi.usmblks));
+          (CHUNK_SIZE_T)(mi.usmblks));
   fprintf(stderr, "system bytes     = %10lu  (%10lu sbrked, %10lu mmaped)\n",
-          (CHUNK_SIZE_T)(mi.arena + mi.hblkhd),
-          (CHUNK_SIZE_T)(mi.arena),
-          (CHUNK_SIZE_T)(mi.hblkhd));
+          (CHUNK_SIZE_T)(mi.arena + mi.hblkhd),
+          (CHUNK_SIZE_T)(mi.arena),
+          (CHUNK_SIZE_T)(mi.hblkhd));
   fprintf(stderr, "in use bytes     = %10lu\n",
-          (CHUNK_SIZE_T)(mi.uordblks + mi.hblkhd));
-
+          (CHUNK_SIZE_T)(mi.uordblks + mi.hblkhd));
 }