PHPC-889: Validate Javascript scope on BSON decoding

Author: alcaeus

scripts/convert-bson-corpus-tests.php

@@ -8,7 +8,6 @@
     'Int64 type: -1' => 'PHP encodes integers as 32-bit if range allows',
     'Int64 type: 0' => 'PHP encodes integers as 32-bit if range allows',
     'Int64 type: 1' => 'PHP encodes integers as 32-bit if range allows',
-    'Javascript Code with Scope: bad scope doc (field has bad string length)' => 'Depends on PHPC-889',
     'Javascript Code with Scope: Unicode and embedded null in code string, empty scope' => 'Embedded null in code string is not supported in libbson (CDRIVER-1879)',
     'Multiple types within the same document: All BSON types' => 'PHP encodes integers as 32-bit if range allows',
     'Top-level document validity: Bad $date (number, not string or hash)' => 'Legacy extended JSON $date syntax uses numbers (CDRIVER-2223)',

src/bson.c

@@ -615,6 +615,15 @@ static void php_phongo_bson_new_javascript_from_javascript_and_scope(zval* objec
 	intern->code     = estrndup(code, code_len);
 	intern->code_len = code_len;
 	intern->scope    = scope ? bson_copy(scope) : NULL;
+
+	if (scope) {
+		php_phongo_bson_state state;
+
+		PHONGO_BSON_INIT_STATE(state);
+
+		php_phongo_bson_to_zval_ex(bson_get_data(intern->scope), intern->scope->len, &state);
+		zval_ptr_dtor(&state.zchild);
+	}
 } /* }}} */
 
 static void php_phongo_bson_new_javascript_from_javascript(zval* object, const char* code, size_t code_len TSRMLS_DC) /* {{{ */

tests/bson-corpus/code_w_scope-decodeError-011.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Javascript Code with Scope: bad scope doc (field has bad string length)
---XFAIL--
-Depends on PHPC-889
 --DESCRIPTION--
 Generated by scripts/convert-bson-corpus-tests.php