SERVER-4806: check for BufBuilder realloc success. (thx @spencerjackson for pull req 169)

2 files changed, 4 insertions, 1 deletions

diff --git a/docs/errors.md b/docs/errors.md
index 676682ae5a1..60d18832fe1 100644
--- a/docs/errors.md
+++ b/docs/errors.md
@@ -63,6 +63,7 @@ src/mongo/bson/util/builder.h
 * 13548 [code](http://github.com/mongodb/mongo/blob/master/src/mongo/bson/util/builder.h#L209) 
 * 15912 [code](http://github.com/mongodb/mongo/blob/master/src/mongo/bson/util/builder.h#L72) out of memory StackAllocator::Realloc
 * 15913 [code](http://github.com/mongodb/mongo/blob/master/src/mongo/bson/util/builder.h#L122) out of memory BufBuilder::reset
+* 16070 [code](http://github.com/mongodb/mongo/blob/master/src/mongo/bson/util/builder.h#L212) out of memory BufBuilder::grow_reallocate
 
 
 src/mongo/client/clientAndShell.cpp
diff --git a/src/mongo/bson/util/builder.h b/src/mongo/bson/util/builder.h
index bd6462cc6a3..38e606d4153 100644
--- a/src/mongo/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
@@ -209,7 +209,9 @@ namespace mongo {
                 msgasserted(13548, ss.str().c_str());
             }
             data = (char *) al.Realloc(data, a);
-            size= a;
+            if ( data == NULL )
+                msgasserted( 16070 , "out of memory BufBuilder::grow_reallocate" );
+            size = a;
         }
 
         char *data;