Testi

danog · danog · commit 9d66170424a5 · 2025-07-23T14:17:33.000+02:00
diff --git a/php_phongo.h b/php_phongo.h
@@ -70,7 +70,9 @@ zend_object_handlers* phongo_get_std_object_handlers(void);
 			(props) = zend_array_dup((intern)->php_properties);           \
 		} else {                                                          \
 			if ((intern)->properties) {                                   \
-				zend_hash_release(intern->properties);                    \
+				(props) = (intern)->properties; \
+				(intern)->properties = NULL; \
+				zend_hash_release(props);                    \
 			}                                                             \
 			(props) = zend_array_dup((intern)->php_properties);           \
 			(intern)->properties = (props);                               \
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -213,11 +213,16 @@ static void php_phongo_binary_free_object(zend_object* object)
 		efree(intern->data);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/DBPointer.c b/src/BSON/DBPointer.c
@@ -176,11 +176,16 @@ static void php_phongo_dbpointer_free_object(zend_object* object)
 		efree(intern->ref);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -168,11 +168,16 @@ static void php_phongo_decimal128_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Document.c b/src/BSON/Document.c
@@ -446,11 +446,16 @@ static void php_phongo_document_free_object(zend_object* object)
 		bson_destroy(intern->bson);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Int64.c b/src/BSON/Int64.c
@@ -175,11 +175,16 @@ static void php_phongo_int64_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -248,11 +248,16 @@ static void php_phongo_iterator_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	php_phongo_iterator_free_current(intern);
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -262,11 +262,16 @@ static void php_phongo_javascript_free_object(zend_object* object)
 		intern->scope = NULL;
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/ObjectId.c b/src/BSON/ObjectId.c
@@ -96,6 +96,9 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b
 		ZVAL_STRING(&zv, intern->oid);
 		zend_hash_str_update(props, "oid", sizeof("oid") - 1, &zv);
 	}
+	if (!is_temp) {
+		GC_ADDREF(props);
+	}
 
 	return props;
 }
@@ -202,11 +205,16 @@ static void php_phongo_objectid_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/PackedArray.c b/src/BSON/PackedArray.c
@@ -430,11 +430,16 @@ static void php_phongo_packedarray_free_object(zend_object* object)
 		bson_destroy(intern->bson);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -228,11 +228,16 @@ static void php_phongo_regex_free_object(zend_object* object)
 		efree(intern->flags);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Symbol.c b/src/BSON/Symbol.c
@@ -150,11 +150,16 @@ static void php_phongo_symbol_free_object(zend_object* object)
 		efree(intern->symbol);
 	}
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -261,11 +261,16 @@ static void php_phongo_timestamp_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -301,11 +301,16 @@ static void php_phongo_utcdatetime_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 }
 
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -183,11 +183,16 @@ static void php_phongo_readconcern_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->read_concern) {
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -483,11 +483,16 @@ static void php_phongo_readpreference_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->read_preference) {
diff --git a/src/MongoDB/ServerApi.c b/src/MongoDB/ServerApi.c
@@ -211,11 +211,16 @@ static void php_phongo_serverapi_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->server_api) {
diff --git a/src/MongoDB/ServerDescription.c b/src/MongoDB/ServerDescription.c
@@ -158,11 +158,16 @@ static void php_phongo_serverdescription_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->server_description) {
diff --git a/src/MongoDB/TopologyDescription.c b/src/MongoDB/TopologyDescription.c
@@ -107,11 +107,16 @@ static void php_phongo_topologydescription_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->topology_description) {
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -368,11 +368,16 @@ static void php_phongo_writeconcern_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
+
 	if (intern->properties) {
-		zend_hash_release(intern->properties);
+		HashTable* props = intern->properties;
+		intern->properties = NULL;
+		zend_hash_release(props);
 	}
 	if (intern->php_properties) {
-		zend_hash_release(intern->php_properties);
+		HashTable* props = intern->php_properties;
+		intern->php_properties = NULL;
+		zend_hash_release(props);
 	}
 
 	if (intern->write_concern) {

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,16 @@ static void php_phongo_binary_free_object(zend_object* object)`
`213`	`213`	`efree(intern->data);`
`214`	`214`	`}`
`215`	`215`
	`216`	`+`
`216`	`217`	`if (intern->properties) {`
`217`		`- zend_hash_release(intern->properties);`
	`218`	`+ HashTable* props = intern->properties;`
	`219`	`+ intern->properties = NULL;`
	`220`	`+ zend_hash_release(props);`
`218`	`221`	`}`
`219`	`222`	`if (intern->php_properties) {`
`220`		`- zend_hash_release(intern->php_properties);`
	`223`	`+ HashTable* props = intern->php_properties;`
	`224`	`+ intern->php_properties = NULL;`
	`225`	`+ zend_hash_release(props);`
`221`	`226`	`}`
`222`	`227`	`}`
`223`	`228`
Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,16 @@ static void php_phongo_dbpointer_free_object(zend_object* object)`
`176`	`176`	`efree(intern->ref);`
`177`	`177`	`}`
`178`	`178`
	`179`	`+`
`179`	`180`	`if (intern->properties) {`
`180`		`- zend_hash_release(intern->properties);`
	`181`	`+ HashTable* props = intern->properties;`
	`182`	`+ intern->properties = NULL;`
	`183`	`+ zend_hash_release(props);`
`181`	`184`	`}`
`182`	`185`	`if (intern->php_properties) {`
`183`		`- zend_hash_release(intern->php_properties);`
	`186`	`+ HashTable* props = intern->php_properties;`
	`187`	`+ intern->php_properties = NULL;`
	`188`	`+ zend_hash_release(props);`
`184`	`189`	`}`
`185`	`190`	`}`
`186`	`191`
Original file line number	Diff line number	Diff line change
`@@ -168,11 +168,16 @@ static void php_phongo_decimal128_free_object(zend_object* object)`
`168`	`168`
`169`	`169`	`zend_object_std_dtor(&intern->std);`
`170`	`170`
	`171`	`+`
`171`	`172`	`if (intern->properties) {`
`172`		`- zend_hash_release(intern->properties);`
	`173`	`+ HashTable* props = intern->properties;`
	`174`	`+ intern->properties = NULL;`
	`175`	`+ zend_hash_release(props);`
`173`	`176`	`}`
`174`	`177`	`if (intern->php_properties) {`
`175`		`- zend_hash_release(intern->php_properties);`
	`178`	`+ HashTable* props = intern->php_properties;`
	`179`	`+ intern->php_properties = NULL;`
	`180`	`+ zend_hash_release(props);`
`176`	`181`	`}`
`177`	`182`	`}`
`178`	`183`
Original file line number	Diff line number	Diff line change
`@@ -446,11 +446,16 @@ static void php_phongo_document_free_object(zend_object* object)`
`446`	`446`	`bson_destroy(intern->bson);`
`447`	`447`	`}`
`448`	`448`
	`449`	`+`
`449`	`450`	`if (intern->properties) {`
`450`		`- zend_hash_release(intern->properties);`
	`451`	`+ HashTable* props = intern->properties;`
	`452`	`+ intern->properties = NULL;`
	`453`	`+ zend_hash_release(props);`
`451`	`454`	`}`
`452`	`455`	`if (intern->php_properties) {`
`453`		`- zend_hash_release(intern->php_properties);`
	`456`	`+ HashTable* props = intern->php_properties;`
	`457`	`+ intern->php_properties = NULL;`
	`458`	`+ zend_hash_release(props);`
`454`	`459`	`}`
`455`	`460`	`}`
`456`	`461`
Original file line number	Diff line number	Diff line change
`@@ -175,11 +175,16 @@ static void php_phongo_int64_free_object(zend_object* object)`
`175`	`175`
`176`	`176`	`zend_object_std_dtor(&intern->std);`
`177`	`177`
	`178`	`+`
`178`	`179`	`if (intern->properties) {`
`179`		`- zend_hash_release(intern->properties);`
	`180`	`+ HashTable* props = intern->properties;`
	`181`	`+ intern->properties = NULL;`
	`182`	`+ zend_hash_release(props);`
`180`	`183`	`}`
`181`	`184`	`if (intern->php_properties) {`
`182`		`- zend_hash_release(intern->php_properties);`
	`185`	`+ HashTable* props = intern->php_properties;`
	`186`	`+ intern->php_properties = NULL;`
	`187`	`+ zend_hash_release(props);`
`183`	`188`	`}`
`184`	`189`	`}`
`185`	`190`
Original file line number	Diff line number	Diff line change
`@@ -262,11 +262,16 @@ static void php_phongo_javascript_free_object(zend_object* object)`
`262`	`262`	`intern->scope = NULL;`
`263`	`263`	`}`
`264`	`264`
	`265`	`+`
`265`	`266`	`if (intern->properties) {`
`266`		`- zend_hash_release(intern->properties);`
	`267`	`+ HashTable* props = intern->properties;`
	`268`	`+ intern->properties = NULL;`
	`269`	`+ zend_hash_release(props);`
`267`	`270`	`}`
`268`	`271`	`if (intern->php_properties) {`
`269`		`- zend_hash_release(intern->php_properties);`
	`272`	`+ HashTable* props = intern->php_properties;`
	`273`	`+ intern->php_properties = NULL;`
	`274`	`+ zend_hash_release(props);`
`270`	`275`	`}`
`271`	`276`	`}`
`272`	`277`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b`
`96`	`96`	`ZVAL_STRING(&zv, intern->oid);`
`97`	`97`	`zend_hash_str_update(props, "oid", sizeof("oid") - 1, &zv);`
`98`	`98`	`}`
	`99`	`+ if (!is_temp) {`
	`100`	`+ GC_ADDREF(props);`
	`101`	`+ }`
`99`	`102`
`100`	`103`	`return props;`
`101`	`104`	`}`
`@@ -202,11 +205,16 @@ static void php_phongo_objectid_free_object(zend_object* object)`
`202`	`205`
`203`	`206`	`zend_object_std_dtor(&intern->std);`
`204`	`207`
	`208`	`+`
`205`	`209`	`if (intern->properties) {`
`206`		`- zend_hash_release(intern->properties);`
	`210`	`+ HashTable* props = intern->properties;`
	`211`	`+ intern->properties = NULL;`
	`212`	`+ zend_hash_release(props);`
`207`	`213`	`}`
`208`	`214`	`if (intern->php_properties) {`
`209`		`- zend_hash_release(intern->php_properties);`
	`215`	`+ HashTable* props = intern->php_properties;`
	`216`	`+ intern->php_properties = NULL;`
	`217`	`+ zend_hash_release(props);`
`210`	`218`	`}`
`211`	`219`	`}`
`212`	`220`
Original file line number	Diff line number	Diff line change
`@@ -430,11 +430,16 @@ static void php_phongo_packedarray_free_object(zend_object* object)`
`430`	`430`	`bson_destroy(intern->bson);`
`431`	`431`	`}`
`432`	`432`
	`433`	`+`
`433`	`434`	`if (intern->properties) {`
`434`		`- zend_hash_release(intern->properties);`
	`435`	`+ HashTable* props = intern->properties;`
	`436`	`+ intern->properties = NULL;`
	`437`	`+ zend_hash_release(props);`
`435`	`438`	`}`
`436`	`439`	`if (intern->php_properties) {`
`437`		`- zend_hash_release(intern->php_properties);`
	`440`	`+ HashTable* props = intern->php_properties;`
	`441`	`+ intern->php_properties = NULL;`
	`442`	`+ zend_hash_release(props);`
`438`	`443`	`}`
`439`	`444`	`}`
`440`	`445`