Fix

danog · danog · commit 9343af50eb47 · 2025-07-25T12:15:58.000+02:00
diff --git a/php_phongo.h b/php_phongo.h
@@ -60,29 +60,18 @@ ZEND_TSRMLS_CACHE_EXTERN()
 
 zend_object_handlers* phongo_get_std_object_handlers(void);
 
-#define PHONGO_RETURN_PROPS(is_temp, props) \
-	if (!(is_temp)) {                       \
-		GC_ADDREF(props);                   \
-	}                                       \
-	return props;
-
-#define PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size)        \
-	do {                                                                         \
-		if (!(intern)->php_properties) {                                         \
-			ALLOC_HASHTABLE((intern)->php_properties);                           \
-			zend_hash_init((intern)->php_properties, 0, NULL, ZVAL_PTR_DTOR, 0); \
-		}                                                                        \
-		if (is_temp) {                                                           \
-			(props) = zend_array_dup((intern)->php_properties);                  \
-		} else {                                                                 \
-			(props) = zend_array_dup((intern)->php_properties);                  \
-			if ((intern)->properties) {                                          \
-				HashTable* __tmp     = (intern)->properties;                     \
-				(intern)->properties = NULL;                                     \
-				zend_hash_release(__tmp);                                        \
-			}                                                                    \
-			(intern)->properties = (props);                                      \
-		}                                                                        \
+#define PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size) \
+	do {                                                                  \
+		if (is_temp) {                                                    \
+			ALLOC_HASHTABLE(props);                                       \
+			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
+		} else if ((intern)->properties) {                                \
+			(props) = (intern)->properties;                               \
+		} else {                                                          \
+			ALLOC_HASHTABLE(props);                                       \
+			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
+			(intern)->properties = (props);                               \
+		}                                                                 \
 	} while (0)
 
 #define PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props) \
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -73,7 +73,7 @@ static HashTable* php_phongo_binary_get_properties_hash(zend_object* object, boo
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->data) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -86,7 +86,7 @@ static HashTable* php_phongo_binary_get_properties_hash(zend_object* object, boo
 		zend_hash_str_update(props, "type", sizeof("type") - 1, &type);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 /* Construct a new BSON binary type */
diff --git a/src/BSON/DBPointer.c b/src/BSON/DBPointer.c
@@ -74,7 +74,7 @@ HashTable* php_phongo_dbpointer_get_properties_hash(zend_object* object, bool is
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->ref) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -86,7 +86,7 @@ HashTable* php_phongo_dbpointer_get_properties_hash(zend_object* object, bool is
 		zend_hash_str_update(props, "id", sizeof("id") - 1, &id);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_DBPointer)
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -64,7 +64,7 @@ static HashTable* php_phongo_decimal128_get_properties_hash(zend_object* object,
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
 
 	if (!intern->initialized) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	bson_decimal128_to_string(&intern->decimal, outbuf);
@@ -76,7 +76,7 @@ static HashTable* php_phongo_decimal128_get_properties_hash(zend_object* object,
 		zend_hash_str_update(props, "dec", sizeof("dec") - 1, &dec);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 /* Construct a new BSON Decimal128 type */
diff --git a/src/BSON/Document.c b/src/BSON/Document.c
@@ -65,7 +65,7 @@ static HashTable* php_phongo_document_get_properties_hash(zend_object* object, b
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);
 
 	if (!intern->bson) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -75,7 +75,7 @@ static HashTable* php_phongo_document_get_properties_hash(zend_object* object, b
 		zend_hash_str_update(props, "data", sizeof("data") - 1, &data);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_Document)
@@ -526,7 +526,7 @@ static HashTable* php_phongo_document_get_debug_info(zend_object* object, int* i
 		zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 
 failure:
 	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
diff --git a/src/BSON/Int64.c b/src/BSON/Int64.c
@@ -72,7 +72,7 @@ HashTable* php_phongo_int64_get_properties_hash(zend_object* object, bool is_tem
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->initialized) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -82,7 +82,7 @@ HashTable* php_phongo_int64_get_properties_hash(zend_object* object, bool is_tem
 		zend_hash_str_update(props, "integer", sizeof("integer") - 1, &value);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static PHP_METHOD(MongoDB_BSON_Int64, __construct)
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -165,7 +165,7 @@ static HashTable* php_phongo_iterator_get_properties_hash(zend_object* object, b
 	zend_hash_str_update(props, "bson", sizeof("bson") - 1, &intern->bson);
 	Z_TRY_ADDREF(intern->bson);
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_Iterator)
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -79,7 +79,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->code) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -106,7 +106,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i
 		}
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 
 failure:
 	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
diff --git a/src/BSON/ObjectId.c b/src/BSON/ObjectId.c
@@ -87,7 +87,7 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
 
 	if (!intern->initialized) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -97,7 +97,7 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b
 		zend_hash_str_update(props, "oid", sizeof("oid") - 1, &zv);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 /* Constructs a new BSON ObjectId type, optionally from a hex string. */
diff --git a/src/BSON/PackedArray.c b/src/BSON/PackedArray.c
@@ -66,7 +66,7 @@ static HashTable* php_phongo_packedarray_get_properties_hash(zend_object* object
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);
 
 	if (!intern->bson) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -76,7 +76,7 @@ static HashTable* php_phongo_packedarray_get_properties_hash(zend_object* object
 		zend_hash_str_update(props, "data", sizeof("data") - 1, &data);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static bool php_phongo_packedarray_to_json(zval* return_value, bson_json_mode_t mode, const bson_t* bson)
@@ -511,7 +511,7 @@ static HashTable* php_phongo_packedarray_get_debug_info(zend_object* object, int
 		zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 
 failure:
 	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -88,7 +88,7 @@ static HashTable* php_phongo_regex_get_properties_hash(zend_object* object, bool
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->pattern) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -101,7 +101,7 @@ static HashTable* php_phongo_regex_get_properties_hash(zend_object* object, bool
 		zend_hash_str_update(props, "flags", sizeof("flags") - 1, &flags);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 /* Constructs a new BSON regular expression type. */
diff --git a/src/BSON/Symbol.c b/src/BSON/Symbol.c
@@ -62,7 +62,7 @@ HashTable* php_phongo_symbol_get_properties_hash(zend_object* object, bool is_te
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->symbol) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -72,7 +72,7 @@ HashTable* php_phongo_symbol_get_properties_hash(zend_object* object, bool is_te
 		zend_hash_str_update(props, "symbol", sizeof("symbol") - 1, &symbol);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_Symbol)
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -99,7 +99,7 @@ static HashTable* php_phongo_timestamp_get_properties_hash(zend_object* object,
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
 
 	if (!intern->initialized) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	s_increment_len = snprintf(s_increment, sizeof(s_increment), "%" PRIu32, intern->increment);
@@ -115,7 +115,7 @@ static HashTable* php_phongo_timestamp_get_properties_hash(zend_object* object,
 		zend_hash_str_update(props, "timestamp", sizeof("timestamp") - 1, &timestamp);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 /* Construct a new BSON timestamp type, which consists of a 4-byte increment and
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -131,7 +131,7 @@ static HashTable* php_phongo_utcdatetime_get_properties_hash(zend_object* object
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
 
 	if (!intern->initialized) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	{
@@ -141,7 +141,7 @@ static HashTable* php_phongo_utcdatetime_get_properties_hash(zend_object* object
 		zend_hash_str_update(props, "milliseconds", sizeof("milliseconds") - 1, &milliseconds);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static void php_phongo_utcdatetime_to_php_date(zval* return_value, const zval* this, zend_class_entry* ce)
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -133,7 +133,7 @@ static HashTable* php_phongo_readconcern_get_properties_hash(zend_object* object
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
 
 	if (!intern->read_concern) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	level = mongoc_read_concern_get_level(intern->read_concern);
@@ -145,7 +145,7 @@ static HashTable* php_phongo_readconcern_get_properties_hash(zend_object* object
 		zend_hash_str_update(props, "level", sizeof("level") - 1, &z_level);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static PHP_METHOD(MongoDB_Driver_ReadConcern, bsonSerialize)
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -392,7 +392,7 @@ static HashTable* php_phongo_readpreference_get_properties_hash(zend_object* obj
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 4);
 
 	if (!intern->read_preference) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	tags  = mongoc_read_prefs_get_tags(intern->read_preference);
@@ -445,7 +445,7 @@ static HashTable* php_phongo_readpreference_get_properties_hash(zend_object* obj
 	}
 
 done:
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static PHP_METHOD(MongoDB_Driver_ReadPreference, bsonSerialize)
diff --git a/src/MongoDB/ServerApi.c b/src/MongoDB/ServerApi.c
@@ -173,7 +173,7 @@ static HashTable* php_phongo_serverapi_get_properties_hash(zend_object* object,
 		zend_hash_str_add(props, "deprecationErrors", sizeof("deprecationErrors") - 1, &deprecation_errors);
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static PHP_METHOD(MongoDB_Driver_ServerApi, bsonSerialize)
diff --git a/src/MongoDB/ServerDescription.c b/src/MongoDB/ServerDescription.c
@@ -196,7 +196,7 @@ HashTable* php_phongo_serverdescription_get_properties_hash(zend_object* object,
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_debug, intern, props, 6);
 
 	if (!intern->server_description) {
-		PHONGO_RETURN_PROPS(is_debug, props);
+		return props;
 	}
 
 	{
@@ -259,7 +259,7 @@ HashTable* php_phongo_serverdescription_get_properties_hash(zend_object* object,
 	}
 
 done:
-	PHONGO_RETURN_PROPS(is_debug, props);
+	return props;
 }
 
 static HashTable* php_phongo_serverdescription_get_debug_info(zend_object* object, int* is_temp)
diff --git a/src/MongoDB/TopologyDescription.c b/src/MongoDB/TopologyDescription.c
@@ -145,7 +145,7 @@ HashTable* php_phongo_topologydescription_get_properties_hash(zend_object* objec
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_debug, intern, props, 2);
 
 	if (!intern->topology_description) {
-		PHONGO_RETURN_PROPS(is_debug, props);
+		return props;
 	}
 
 	{
@@ -172,7 +172,7 @@ HashTable* php_phongo_topologydescription_get_properties_hash(zend_object* objec
 		zend_hash_str_update(props, "type", sizeof("type") - 1, &type);
 	}
 
-	PHONGO_RETURN_PROPS(is_debug, props);
+	return props;
 }
 
 static HashTable* php_phongo_topologydescription_get_debug_info(zend_object* object, int* is_temp)
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -275,7 +275,7 @@ static HashTable* php_phongo_writeconcern_get_properties_hash(zend_object* objec
 	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 4);
 
 	if (!intern->write_concern) {
-		PHONGO_RETURN_PROPS(is_temp, props);
+		return props;
 	}
 
 	wtag     = mongoc_write_concern_get_wtag(intern->write_concern);
@@ -330,7 +330,7 @@ static HashTable* php_phongo_writeconcern_get_properties_hash(zend_object* objec
 		}
 	}
 
-	PHONGO_RETURN_PROPS(is_temp, props);
+	return props;
 }
 
 static PHP_METHOD(MongoDB_Driver_WriteConcern, bsonSerialize)

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static HashTable* php_phongo_binary_get_properties_hash(zend_object* object, boo`
`73`	`73`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);`
`74`	`74`
`75`	`75`	`if (!intern->data) {`
`76`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`76`	`+ return props;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`{`
`@@ -86,7 +86,7 @@ static HashTable* php_phongo_binary_get_properties_hash(zend_object* object, boo`
`86`	`86`	`zend_hash_str_update(props, "type", sizeof("type") - 1, &type);`
`87`	`87`	`}`
`88`	`88`
`89`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`89`	`+ return props;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/* Construct a new BSON binary type */`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ HashTable* php_phongo_dbpointer_get_properties_hash(zend_object* object, bool is`
`74`	`74`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);`
`75`	`75`
`76`	`76`	`if (!intern->ref) {`
`77`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`77`	`+ return props;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`{`
`@@ -86,7 +86,7 @@ HashTable* php_phongo_dbpointer_get_properties_hash(zend_object* object, bool is`
`86`	`86`	`zend_hash_str_update(props, "id", sizeof("id") - 1, &id);`
`87`	`87`	`}`
`88`	`88`
`89`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`89`	`+ return props;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_DBPointer)`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static HashTable* php_phongo_decimal128_get_properties_hash(zend_object* object,`
`64`	`64`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);`
`65`	`65`
`66`	`66`	`if (!intern->initialized) {`
`67`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`67`	`+ return props;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`bson_decimal128_to_string(&intern->decimal, outbuf);`
`@@ -76,7 +76,7 @@ static HashTable* php_phongo_decimal128_get_properties_hash(zend_object* object,`
`76`	`76`	`zend_hash_str_update(props, "dec", sizeof("dec") - 1, &dec);`
`77`	`77`	`}`
`78`	`78`
`79`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`79`	`+ return props;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/* Construct a new BSON Decimal128 type */`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ static HashTable* php_phongo_document_get_properties_hash(zend_object* object, b`
`65`	`65`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);`
`66`	`66`
`67`	`67`	`if (!intern->bson) {`
`68`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`68`	`+ return props;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`{`
`@@ -75,7 +75,7 @@ static HashTable* php_phongo_document_get_properties_hash(zend_object* object, b`
`75`	`75`	`zend_hash_str_update(props, "data", sizeof("data") - 1, &data);`
`76`	`76`	`}`
`77`	`77`
`78`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`78`	`+ return props;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_Document)`
`@@ -526,7 +526,7 @@ static HashTable* php_phongo_document_get_debug_info(zend_object* object, int* i`
`526`	`526`	`zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);`
`527`	`527`	`}`
`528`	`528`
`529`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`529`	`+ return props;`
`530`	`530`
`531`	`531`	`failure:`
`532`	`532`	`PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ HashTable* php_phongo_int64_get_properties_hash(zend_object* object, bool is_tem`
`72`	`72`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);`
`73`	`73`
`74`	`74`	`if (!intern->initialized) {`
`75`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`75`	`+ return props;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`{`
`@@ -82,7 +82,7 @@ HashTable* php_phongo_int64_get_properties_hash(zend_object* object, bool is_tem`
`82`	`82`	`zend_hash_str_update(props, "integer", sizeof("integer") - 1, &value);`
`83`	`83`	`}`
`84`	`84`
`85`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`85`	`+ return props;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`static PHP_METHOD(MongoDB_BSON_Int64, __construct)`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static HashTable* php_phongo_iterator_get_properties_hash(zend_object* object, b`
`165`	`165`	`zend_hash_str_update(props, "bson", sizeof("bson") - 1, &intern->bson);`
`166`	`166`	`Z_TRY_ADDREF(intern->bson);`
`167`	`167`
`168`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`168`	`+ return props;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`PHONGO_DISABLED_CONSTRUCTOR(MongoDB_BSON_Iterator)`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i`
`79`	`79`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);`
`80`	`80`
`81`	`81`	`if (!intern->code) {`
`82`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`82`	`+ return props;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`{`
`@@ -106,7 +106,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`109`	`+ return props;`
`110`	`110`
`111`	`111`	`failure:`
`112`	`112`	`PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b`
`87`	`87`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);`
`88`	`88`
`89`	`89`	`if (!intern->initialized) {`
`90`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`90`	`+ return props;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`{`
`@@ -97,7 +97,7 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b`
`97`	`97`	`zend_hash_str_update(props, "oid", sizeof("oid") - 1, &zv);`
`98`	`98`	`}`
`99`	`99`
`100`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`100`	`+ return props;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/* Constructs a new BSON ObjectId type, optionally from a hex string. */`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static HashTable* php_phongo_packedarray_get_properties_hash(zend_object* object`
`66`	`66`	`PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);`
`67`	`67`
`68`	`68`	`if (!intern->bson) {`
`69`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`69`	`+ return props;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`{`
`@@ -76,7 +76,7 @@ static HashTable* php_phongo_packedarray_get_properties_hash(zend_object* object`
`76`	`76`	`zend_hash_str_update(props, "data", sizeof("data") - 1, &data);`
`77`	`77`	`}`
`78`	`78`
`79`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`79`	`+ return props;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`static bool php_phongo_packedarray_to_json(zval* return_value, bson_json_mode_t mode, const bson_t* bson)`
`@@ -511,7 +511,7 @@ static HashTable* php_phongo_packedarray_get_debug_info(zend_object* object, int`
`511`	`511`	`zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);`
`512`	`512`	`}`
`513`	`513`
`514`		`- PHONGO_RETURN_PROPS(is_temp, props);`
	`514`	`+ return props;`
`515`	`515`
`516`	`516`	`failure:`
`517`	`517`	`PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);`