Merged pull request #72

Author: derickr

src/MongoDB/BSON/functions.cpp

@@ -99,18 +99,24 @@ Variant HHVM_FUNCTION(MongoDBBsonToJson, const String &data)
 
 		str = bson_as_json(b, &str_len);
 
+		if (!str) {
+			bson_reader_destroy(reader);
+			throw MongoDriver::Utils::throwUnexpectedValueException("Could not convert BSON document to a JSON string");
+		}
+
 		s = String(str_len, ReserveString);
 		data_s = (unsigned char*) s.bufferSlice().data();
 		memcpy(data_s, str, str_len);
 		s.setSize(str_len);
 
 		bson_free(str);
 	} else {
+		bson_reader_destroy(reader);
 		throw MongoDriver::Utils::throwUnexpectedValueException("Could not read document from BSON reader");
-		return Variant();
 	}
 
 	if (bson_reader_read(reader, &eof) || !eof) {
+		bson_reader_destroy(reader);
 		throw MongoDriver::Utils::throwUnexpectedValueException("Reading document did not exhaust input buffer");
 	}