Changeset 481 for trunk/src/dnmalloc.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (10 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

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

trunk/src/dnmalloc.c

@@ -220 +220 @@
 #ifdef linux
 #define HAVE_MREMAP 1
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 #else
 #define HAVE_MREMAP 0
@@ -310 +310 @@
   char * i3 = "): ";
   char * i5 = "\n";
-  int   res = 0;
-
-  iov[0].iov_base = i1;               iov[0].iov_len = strlen(i1); 
-  iov[1].iov_base = (char*) file;     iov[1].iov_len = strlen(file); 
-  iov[2].iov_base = i3;               iov[2].iov_len = strlen(i3); 
-  iov[3].iov_base = (char*) error;    iov[3].iov_len = strlen(error); 
-  iov[4].iov_base = i5;               iov[4].iov_len = strlen(i5);
+  int    res = 0;
+  char   ifile[128];
+  char   ierr[128];
+
+  strncpy(ifile, file, sizeof(ifile)); ifile[sizeof(ifile)-1] = '\0';
+  strncpy(ierr, error, sizeof(ierr));  ierr[sizeof(ierr)-1]   = '\0';
+
+  iov[0].iov_base = i1;     iov[0].iov_len = strlen(i1); 
+  iov[1].iov_base = ifile;  iov[1].iov_len = strlen(ifile); 
+  iov[2].iov_base = i3;     iov[2].iov_len = strlen(i3); 
+  iov[3].iov_base = ierr;   iov[3].iov_len = strlen(ierr); 
+  iov[4].iov_base = i5;     iov[4].iov_len = strlen(i5);
   do {
     res = writev(STDERR_FILENO, iov, 5);
@@ -343 +348 @@
 
 static assert_handler_tp *assert_handler = NULL;
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #define assert(x) ((void)0)
 
@@ -3764 +3771 @@
     } /* not extended previous region */
     
-    /* Update statistics */ /* FIXME check this */
+    /* Update statistics */
     sum = av->sbrked_mem;
     if (sum > (CHUNK_SIZE_T)(av->max_sbrked_mem))