PHPC-616: Document and array visitors should throw for corrupt BSON

Author: jmikola

src/bson.c

@@ -655,6 +655,7 @@ bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const ch
 			 * visitor. Free state.zchild, which we just initialized, and return
 			 * true to stop iteration for our parent context. */
 			zval_ptr_dtor(&state.zchild);
+			return true;
 		}
 	}
 
@@ -735,6 +736,7 @@ bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char
 			 * visitor. Free state.zchild, which we just initialized, and return
 			 * true to stop iteration for our parent context. */
 			zval_ptr_dtor(&state.zchild);
+			return true;
 		}
 
 	}

tests/bson/bson-toPHP_error-004.phpt

@@ -9,6 +9,10 @@ require_once __DIR__ . "/../utils/basic.inc";
 $tests = array(
     // Invalid UTF-8 character in root document's field name
     str_replace('INVALID!', "INVALID\xFE", fromPHP(['INVALID!' => 'bar'])),
+    // Invalid UTF-8 character in embedded document's field name
+    str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['INVALID!' => 'bar']])),
+    // Invalid UTF-8 character in string within array field
+    str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['INVALID!']])),
     /* Note: we don't use a three-character string in the underflow case, as
      * the 4-byte string length and payload (i.e. three characters + null byte)
      * coincidentally satisfy the expected size for an 8-byte double. We also
@@ -36,4 +40,8 @@ OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 Could not convert BSON document to a PHP variable
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 Could not convert BSON document to a PHP variable
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+Could not convert BSON document to a PHP variable
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+Could not convert BSON document to a PHP variable
 ===DONE===