SERVER-14889 wrapped all malloc/realloc calls within src/mongo with mongoMalloc/mongoRealloc.

             if memory allocation fails, report error and exit.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/mongo/bson/util/builder.h b/src/mongo/bson/util/builder.h
index 00924458e7a..38e24b59d5f 100644
--- a/src/mongo/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
@@ -38,6 +38,7 @@
 
 #include "mongo/bson/inline_decls.h"
 #include "mongo/base/string_data.h"
+#include "mongo/util/allocator.h"
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
@@ -74,8 +75,8 @@ namespace mongo {
 
     class TrivialAllocator { 
     public:
-        void* Malloc(size_t sz) { return malloc(sz); }
-        void* Realloc(void *p, size_t sz) { return realloc(p, sz); }
+        void* Malloc(size_t sz) { return mongoMalloc(sz); }
+        void* Realloc(void *p, size_t sz) { return mongoRealloc(p, sz); }
         void Free(void *p) { free(p); }
     };
 
@@ -84,18 +85,18 @@ namespace mongo {
         enum { SZ = 512 };
         void* Malloc(size_t sz) {
             if( sz <= SZ ) return buf;
-            return malloc(sz); 
+            return mongoMalloc(sz);
         }
         void* Realloc(void *p, size_t sz) { 
             if( p == buf ) {
                 if( sz <= SZ ) return buf;
-                void *d = malloc(sz);
+                void *d = mongoMalloc(sz);
                 if ( d == 0 )
                     msgasserted( 15912 , "out of memory StackAllocator::Realloc" );
                 memcpy(d, p, SZ);
                 return d;
             }
-            return realloc(p, sz); 
+            return mongoRealloc(p, sz);
         }
         void Free(void *p) { 
             if( p != buf )