Merge pull request #39 from tessavitabile/TOOLS-878_v3.0

TOOLS-878_v3.0 BSON stream decoder checks for size < 5

1 files changed, 2 insertions, 1 deletions

diff --git a/common/db/bson_stream.go b/common/db/bson_stream.go
index 35304a7c43b..1cfdc29904b 100644
--- a/common/db/bson_stream.go
+++ b/common/db/bson_stream.go
@@ -91,7 +91,8 @@ func (bs *BSONSource) LoadNextInto(into []byte) (bool, int32) {
 	// Verify that the size of the BSON object we are about to read can
 	// actually fit into the buffer that was provided. If not, either the BSON is
 	// invalid, or the buffer passed in is too small.
-	if bsonSize > int32(len(into)) {
+	// Verify that we do not have an invalid BSON document with size < 5.
+	if bsonSize > int32(len(into)) || bsonSize < 5 {
 		bs.err = fmt.Errorf("invalid BSONSize: %v bytes", bsonSize)
 		return false, 0
 	}