Merge pull request #1036

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

@@ -605,21 +605,37 @@ static bool php_phongo_bson_visit_symbol(const bson_iter_t* iter, const char* ke
 	return false;
 } /* }}} */
 
-static void php_phongo_bson_new_javascript_from_javascript_and_scope(zval* object, const char* code, size_t code_len, const bson_t* scope TSRMLS_DC) /* {{{ */
+static bool php_phongo_bson_new_javascript_from_javascript_and_scope(zval* object, const char* code, size_t code_len, const bson_t* scope TSRMLS_DC) /* {{{ */
 {
 	php_phongo_javascript_t* intern;
 
+	if (scope) {
+		php_phongo_bson_state state;
+		bool valid_scope;
+
+		PHONGO_BSON_INIT_STATE(state);
+
+		valid_scope = php_phongo_bson_to_zval_ex(bson_get_data(scope), scope->len, &state);
+		zval_ptr_dtor(&state.zchild);
+
+		if (!valid_scope) {
+			return false;
+		}
+	}
+
 	object_init_ex(object, php_phongo_javascript_ce);
 
 	intern           = Z_JAVASCRIPT_OBJ_P(object);
 	intern->code     = estrndup(code, code_len);
 	intern->code_len = code_len;
 	intern->scope    = scope ? bson_copy(scope) : NULL;
+
+	return true;
 } /* }}} */
 
-static void php_phongo_bson_new_javascript_from_javascript(zval* object, const char* code, size_t code_len TSRMLS_DC) /* {{{ */
+static bool php_phongo_bson_new_javascript_from_javascript(zval* object, const char* code, size_t code_len TSRMLS_DC) /* {{{ */
 {
-	php_phongo_bson_new_javascript_from_javascript_and_scope(object, code, code_len, NULL TSRMLS_CC);
+	return php_phongo_bson_new_javascript_from_javascript_and_scope(object, code, code_len, NULL TSRMLS_CC);
 } /* }}} */
 
 static bool php_phongo_bson_visit_code(const bson_iter_t* iter ARG_UNUSED, const char* key, size_t v_code_len, const char* v_code, void* data) /* {{{ */
@@ -629,7 +645,9 @@ static bool php_phongo_bson_visit_code(const bson_iter_t* iter ARG_UNUSED, const
 #if PHP_VERSION_ID >= 70000
 	zval zchild;
 
-	php_phongo_bson_new_javascript_from_javascript(&zchild, v_code, v_code_len TSRMLS_CC);
+	if (!php_phongo_bson_new_javascript_from_javascript(&zchild, v_code, v_code_len TSRMLS_CC)) {
+		return true;
+	}
 
 	if (state->is_visiting_array) {
 		add_next_index_zval(retval, &zchild);
@@ -641,7 +659,10 @@ static bool php_phongo_bson_visit_code(const bson_iter_t* iter ARG_UNUSED, const
 	TSRMLS_FETCH();
 
 	MAKE_STD_ZVAL(zchild);
-	php_phongo_bson_new_javascript_from_javascript(zchild, v_code, v_code_len TSRMLS_CC);
+	if (!php_phongo_bson_new_javascript_from_javascript(zchild, v_code, v_code_len TSRMLS_CC)) {
+		zval_ptr_dtor(&zchild);
+		return true;
+	}
 
 	if (state->is_visiting_array) {
 		add_next_index_zval(retval, zchild);
@@ -707,7 +728,9 @@ static bool php_phongo_bson_visit_codewscope(const bson_iter_t* iter ARG_UNUSED,
 #if PHP_VERSION_ID >= 70000
 	zval zchild;
 
-	php_phongo_bson_new_javascript_from_javascript_and_scope(&zchild, v_code, v_code_len, v_scope TSRMLS_CC);
+	if (!php_phongo_bson_new_javascript_from_javascript_and_scope(&zchild, v_code, v_code_len, v_scope TSRMLS_CC)) {
+		return true;
+	}
 
 	if (state->is_visiting_array) {
 		add_next_index_zval(retval, &zchild);
@@ -719,7 +742,10 @@ static bool php_phongo_bson_visit_codewscope(const bson_iter_t* iter ARG_UNUSED,
 	TSRMLS_FETCH();
 
 	MAKE_STD_ZVAL(zchild);
-	php_phongo_bson_new_javascript_from_javascript_and_scope(zchild, v_code, v_code_len, v_scope TSRMLS_CC);
+	if (!php_phongo_bson_new_javascript_from_javascript_and_scope(zchild, v_code, v_code_len, v_scope TSRMLS_CC)) {
+		zval_ptr_dtor(&zchild);
+		return true;
+	}
 
 	if (state->is_visiting_array) {
 		add_next_index_zval(retval, zchild);

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