Fix guard propagation for unset()

arnaud-lb · arnaud-lb · commit aa3f8edd2782 · 2025-03-25T11:07:46.000+01:00
diff --git a/Zend/tests/lazy_objects/gh18038-010.phpt b/Zend/tests/lazy_objects/gh18038-010.phpt
@@ -26,7 +26,6 @@ var_dump($obj);
 --EXPECTF--
 string(10) "C::__unset"
 init
-string(10) "C::__unset"
 lazy proxy object(C)#%d (1) {
   ["instance"]=>
   object(C)#%d (1) {
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -1574,10 +1574,10 @@ ZEND_API void zend_std_unset_property(zend_object *zobj, zend_string *name, void
 
 		if (UNEXPECTED(guard)) {
 			guard = zend_get_property_guard(zobj, name);
-			if (!((*guard) & IN_ISSET)) {
-				(*guard) |= IN_ISSET;
+			if (!((*guard) & IN_UNSET)) {
+				(*guard) |= IN_UNSET;
 				zend_std_unset_property(zobj, name, cache_slot);
-				(*guard) &= ~IN_ISSET;
+				(*guard) &= ~IN_UNSET;
 				return;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1574,10 +1574,10 @@ ZEND_API void zend_std_unset_property(zend_object zobj, zend_string name, void`
`1574`	`1574`
`1575`	`1575`	`if (UNEXPECTED(guard)) {`
`1576`	`1576`	`guard = zend_get_property_guard(zobj, name);`
`1577`		`- if (!((*guard) & IN_ISSET)) {`
`1578`		`- (*guard) \|= IN_ISSET;`
	`1577`	`+ if (!((*guard) & IN_UNSET)) {`
	`1578`	`+ (*guard) \|= IN_UNSET;`
`1579`	`1579`	`zend_std_unset_property(zobj, name, cache_slot);`
`1580`		`- (*guard) &= ~IN_ISSET;`
	`1580`	`+ (*guard) &= ~IN_UNSET;`
`1581`	`1581`	`return;`
`1582`	`1582`	`}`
`1583`	`1583`	`}`