HHVM-173: Rephrase unsupported/corrupt BSON messages to be the same as PHPC-554

derickr · derickr · commit 1d51fe96e2fd · 2016-04-22T16:09:54.000+01:00
diff --git a/bson.cpp b/bson.cpp
@@ -799,6 +799,7 @@ bool BsonToVariantConverter::convert(Variant *v)
 
 	if (!bson_iter_init(&iter, b)) {
 		bson_reader_destroy(m_reader);
+		throw MongoDriver::Utils::throwUnexpectedValueException("Could not initialize BSON iterator");
 		return false;
 	}
 
@@ -808,7 +809,7 @@ bool BsonToVariantConverter::convert(Variant *v)
 	if (bson_iter_visit_all(&iter, &hippo_bson_visitors, &m_state) || iter.err_off) {
 		bson_reader_destroy(m_reader);
 
-		throw MongoDriver::Utils::throwUnexpectedValueException("Could not convert BSON document to a PHP variable");
+		throw MongoDriver::Utils::throwUnexpectedValueException("Detected corrupt BSON data.");
 	}
 
 	/* Set "root" to false */
diff --git a/libbson b/libbson
@@ -1 +1 @@
-Subproject commit 3224994dd8c695658ae0a332016156047f5d6c8a
+Subproject commit ab2ee5ba73c6e38263bfd6de892c0e22b128a809

Original file line number	Diff line number	Diff line change
`@@ -799,6 +799,7 @@ bool BsonToVariantConverter::convert(Variant *v)`
`799`	`799`
`800`	`800`	`if (!bson_iter_init(&iter, b)) {`
`801`	`801`	`bson_reader_destroy(m_reader);`
	`802`	`+ throw MongoDriver::Utils::throwUnexpectedValueException("Could not initialize BSON iterator");`
`802`	`803`	`return false;`
`803`	`804`	`}`
`804`	`805`
`@@ -808,7 +809,7 @@ bool BsonToVariantConverter::convert(Variant *v)`
`808`	`809`	`if (bson_iter_visit_all(&iter, &hippo_bson_visitors, &m_state) \|\| iter.err_off) {`
`809`	`810`	`bson_reader_destroy(m_reader);`
`810`	`811`
`811`		`- throw MongoDriver::Utils::throwUnexpectedValueException("Could not convert BSON document to a PHP variable");`
	`812`	`+ throw MongoDriver::Utils::throwUnexpectedValueException("Detected corrupt BSON data.");`
`812`	`813`	`}`
`813`	`814`
`814`	`815`	`/* Set "root" to false */`