Fix a few more places where we need to use our own allocator.

Make tcmalloc compatible with the seccomp sandbox by avoiding making direct system calls from within tcmalloc.

BUG=38973
TEST=none
Review URL: http://codereview.chromium.org/1294001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42667 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 5 deletions

diff --git a/sandbox/linux/seccomp/library.h b/sandbox/linux/seccomp/library.h
index 29a755e..96ec581 100644
--- a/sandbox/linux/seccomp/library.h
+++ b/sandbox/linux/seccomp/library.h
@@ -6,6 +6,7 @@
 #define LIBRARY_H__
 
 #include <elf.h>
+#include <functional>
 #include <map>
 #include <set>
 #include <string>
@@ -135,6 +136,9 @@ class Library {
 
  private:
   class GreaterThan : public std::binary_function<Elf_Addr, Elf_Addr, bool> {
+    // We create the RangeMap with a GreaterThan rather than the default
+    // comparator, as that allows us to use lower_bound() to find memory
+    // mappings.
    public:
     bool operator() (Elf_Addr s1, Elf_Addr s2) const {
       return s1 > s2;
@@ -149,10 +153,19 @@ class Library {
     int   prot;
   };
 
-  typedef std::map<Elf_Addr, Range, GreaterThan> RangeMap;
-  typedef std::map<string, std::pair<int, Elf_Shdr> > SectionTable;
-  typedef std::map<string, Elf_Sym> SymbolTable;
-  typedef std::map<string, Elf_Addr> PltTable;
+  typedef std::map<Elf_Addr, Range, GreaterThan,
+                   SystemAllocator<std::pair<const Elf_Addr,
+                                             Range> > > RangeMap;
+  typedef std::map<string, std::pair<int, Elf_Shdr>, std::less<string>,
+                   SystemAllocator<std::pair<const string,
+                                             std::pair<int, Elf_Shdr> > > >
+                   SectionTable;
+  typedef std::map<string, Elf_Sym, std::less<string>,
+                   SystemAllocator<std::pair<const string,
+                                             Elf_Sym> > > SymbolTable;
+  typedef std::map<string, Elf_Addr, std::less<string>,
+                   SystemAllocator<std::pair<const string,
+                                             Elf_Addr> > > PltTable;
 
   char* getBytes(char* dst, const char* src, ssize_t len);
   static bool isSafeInsn(unsigned short insn);
diff --git a/sandbox/linux/seccomp/maps.h b/sandbox/linux/seccomp/maps.h
index 5f51782..fbcc7672 100644
--- a/sandbox/linux/seccomp/maps.h
+++ b/sandbox/linux/seccomp/maps.h
@@ -37,7 +37,8 @@ class Maps {
   // The key is a unique combination of device number, inode number, and
   // file name. It should be treated as opaque.
   typedef std::map<string, Library, std::less<string>,
-                   SystemAllocator<string> > LibraryMap;
+                   SystemAllocator<std::pair<const string,
+                                             Library> > > LibraryMap;
   friend class Iterator;
   class Iterator {
     friend class Maps;