PHPC-475: toJSON and fromJSON should thrown on error

Author: jmikola

src/bson.c

@@ -1096,6 +1096,7 @@ PHP_FUNCTION(toJSON)
 	      char          *data;
 	      int            data_len;
 	const bson_t        *b;
+	      bool           eof = false;
 	      bson_reader_t *reader;
 
 	(void)return_value_ptr; (void)this_ptr; (void)return_value_used; /* We don't use these */
@@ -1114,8 +1115,13 @@ PHP_FUNCTION(toJSON)
 		RETVAL_STRINGL(str, str_len, 1);
 		bson_free(str);
 	} else {
-		RETURN_NULL();
+		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not read document from BSON reader");
 	}
+
+	if (bson_reader_read(reader, &eof) || !eof) {
+		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Reading document did not exhaust input buffer");
+	}
+
 	bson_reader_destroy(reader);
 }
 /* }}} */
@@ -1139,7 +1145,7 @@ PHP_FUNCTION(fromJSON)
 		RETVAL_STRINGL((const char *) bson_get_data(&b), b.len, 1);
 		bson_destroy(&b);
 	} else {
-		RETURN_NULL();
+		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.message ? error.message : "Error parsing JSON");
 	}
 }
 /* }}} */

tests/bson/bson-fromJSON_error-001.phpt

@@ -7,11 +7,17 @@ BSON\fromJSON(): invalid JSON
 
 require_once __DIR__ . "/../utils/basic.inc";
 
-var_dump(fromJSON('foo'));
+echo throws(function() {
+    fromJSON('foo');
+}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-NULL
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+lexical error: invalid string in json text.
+                                       foo
+                     (right here) ------^
+
 ===DONE===

tests/bson/bson-toJSON_error-001.phpt

@@ -0,0 +1,31 @@
+--TEST--
+BSON\toJSON(): BSON decoding exceptions
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+/* We can't really test for bson_iter_init() failure, since bson_reader_read()
+ * already checks that the buffer is at least 5 bytes.
+ */
+$invalidBson = array(
+    '',
+    str_repeat(fromJSON('{"x": "y"}'), 2),
+);
+
+foreach ($invalidBson as $bson) {
+    echo throws(function() use ($bson) {
+        toJSON($bson);
+    }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+Could not read document from BSON reader
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+Reading document did not exhaust input buffer
+===DONE===