Merge branch 'v1.1'

Author: jmikola

phongo_compat.h

@@ -136,7 +136,10 @@
 # define Z_ISUNDEF(x) !x
 # define phongo_free_object_arg void
 # define phongo_zpp_char_len int
-# define ZEND_HASH_APPLY_COUNT(ht) (ht)->nApplyCount
+# define ZEND_HASH_APPLY_PROTECTION(ht) true
+# define ZEND_HASH_GET_APPLY_COUNT(ht) ((ht)->nApplyCount)
+# define ZEND_HASH_DEC_APPLY_COUNT(ht) ((ht)->nApplyCount -= 1)
+# define ZEND_HASH_INC_APPLY_COUNT(ht) ((ht)->nApplyCount += 1)
 # define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
 # define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen, 1)
 # define PHONGO_RETVAL_STRING(s) RETVAL_STRING(s, 1)

src/bson.c

@@ -905,8 +905,8 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 			tmp_ht = HASH_OF(obj_data);
 #endif
 
-			if (tmp_ht) {
-				ZEND_HASH_APPLY_COUNT(tmp_ht)++;
+			if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+				ZEND_HASH_INC_APPLY_COUNT(tmp_ht);
 			}
 
 			/* Persistable objects must always be serialized as BSON documents;
@@ -940,8 +940,8 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 				bson_append_array_end(bson, &child);
 			}
 
-			if (tmp_ht) {
-				ZEND_HASH_APPLY_COUNT(tmp_ht)--;
+			if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+				ZEND_HASH_DEC_APPLY_COUNT(tmp_ht);
 			}
 			zval_ptr_dtor(&obj_data);
 			return;
@@ -1014,12 +1014,22 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 
 		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(object)->name));
 		return;
-	}
+	} else {
+		HashTable *tmp_ht = HASH_OF(object);
+
+		if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+			ZEND_HASH_INC_APPLY_COUNT(tmp_ht);
+		}
 
-	mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding document");
-	bson_append_document_begin(bson, key, key_len, &child);
-	phongo_zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
-	bson_append_document_end(bson, &child);
+		mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding document");
+		bson_append_document_begin(bson, key, key_len, &child);
+		phongo_zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
+		bson_append_document_end(bson, &child);
+
+		if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+			ZEND_HASH_DEC_APPLY_COUNT(tmp_ht);
+		}
+	}
 }
 
 static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, zval *entry TSRMLS_DC)
@@ -1067,16 +1077,16 @@ static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, cons
 				bson_t     child;
 				HashTable *tmp_ht = HASH_OF(entry);
 
-				if (tmp_ht) {
-					ZEND_HASH_APPLY_COUNT(tmp_ht)++;
+				if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+					ZEND_HASH_INC_APPLY_COUNT(tmp_ht);
 				}
 
 				bson_append_array_begin(bson, key, key_len, &child);
 				phongo_zval_to_bson(entry, flags, &child, NULL TSRMLS_CC);
 				bson_append_array_end(bson, &child);
 
-				if (tmp_ht) {
-					ZEND_HASH_APPLY_COUNT(tmp_ht)--;
+				if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) {
+					ZEND_HASH_DEC_APPLY_COUNT(tmp_ht);
 				}
 				break;
 			}
@@ -1231,7 +1241,7 @@ void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson
 			return;
 	}
 
-	if (!ht_data || ZEND_HASH_APPLY_COUNT(ht_data) > 1) {
+	if (!ht_data || ZEND_HASH_GET_APPLY_COUNT(ht_data) > 1) {
 #if PHP_VERSION_ID >= 70000
 		if (Z_TYPE_P(data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
 #endif

tests/bson/bson-fromPHP-004.phpt

@@ -0,0 +1,38 @@
+--TEST--
+BSON\fromPHP(): PHP documents with circular references
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo "\nTesting packed array with circular reference\n";
+
+$document = ['x' => 1, 'y' => []];
+$document['y'][] = &$document['y'];
+echo toJson(fromPHP($document)), "\n";
+
+echo "\nTesting associative array with circular reference\n";
+
+$document = ['x' => 1, 'y' => []];
+$document['y']['z'] = &$document['y'];
+echo toJson(fromPHP($document)), "\n";
+
+echo "\nTesting object with circular reference\n";
+
+$document = (object) ['x' => 1, 'y' => (object) []];
+$document->y->z = &$document->y;
+echo toJson(fromPHP($document)), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Testing packed array with circular reference
+{ "x" : 1, "y" : [ [  ] ] }
+
+Testing associative array with circular reference
+{ "x" : 1, "y" : { "z" : {  } } }
+
+Testing object with circular reference
+{ "x" : 1, "y" : { "z" : {  } } }
+===DONE===