commit e8bc581333d1fe19d28211330d1e06d471365d54
author Christopher Ferris <cferris@google.com> Fri Jul 18 12:26:45 2014 -0700
committer Christopher Ferris <cferris@google.com> Fri Jul 18 15:23:32 2014 -0700
tree 71b5e4c7a175ac0e848a5daed5ea73d72ad00f62
parent b46696858b9018ff8a1069d429366e05d4814c52

Use the mmap/munmap for allocation routines.

To avoid any issues calling malloc related routines, use mmap/munmap.
Specifically, this avoids any problems when this is compiled into a
malloc debug shared library.

(cherry picked from commit 6425327c3278137d153b8a7505f97d2f5f058d49)

Change-Id: If43d12b2c588c9abcbfbbd2c53702cdac7695a73

libc/bionic/debug_mapinfo.cpp

diff --git a/libc/bionic/debug_mapinfo.cpp b/libc/bionic/debug_mapinfo.cpp
index e81ea54..17276ce 100644
--- a/libc/bionic/debug_mapinfo.cpp
+++ b/libc/bionic/debug_mapinfo.cpp
@@ -29,14 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/mman.h>
 
-#ifdef USE_JEMALLOC
-#include "jemalloc.h"
-#define Malloc(function)  je_ ## function
-#else
-#include "dlmalloc.h"
-#define Malloc(function)  dl ## function
-#endif
 #include "debug_mapinfo.h"
 
 // 6f000000-6f01e000 rwxp 00000000 00:0c 16389419   /system/lib/libcomposer.so
@@ -52,8 +46,9 @@
   if (len < 50) return 0;
   if (line[20] != 'x') return 0;
 
-  mapinfo_t* mi = static_cast<mapinfo_t*>(Malloc(malloc)(sizeof(mapinfo_t) + (len - 47)));
-  if (mi == 0) return 0;
+  mapinfo_t* mi = static_cast<mapinfo_t*>(
+      mmap(NULL, sizeof(mapinfo_t) + (len - 47), PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0));
+  if (mi == MAP_FAILED) return 0;
 
   mi->start = strtoul(line, 0, 16);
   mi->end = strtoul(line + 9, 0, 16);
@@ -85,7 +80,7 @@
   while (mi != NULL) {
     mapinfo_t* del = mi;
     mi = mi->next;
-    Malloc(free)(del);
+    munmap(del, sizeof(mapinfo_t) + strlen(del->name) + 2);
   }
 }