[php-src] master: Cleanup name handling in magic methods (#13733)
| From: | Niels Dossche via GitHub | Date: | Mon, 18 Mar 2024 17:02:01 +0000 |
| Subject: | [php-src] master: Cleanup name handling in magic methods (#13733) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127781@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Committer: GitHub (web-flow)
Pusher: nielsdos
Date: 2024-03-18T17:48:12+01:00
Commit: https://github.com/php/php-src/commit/f47b7f1c704b87acbdea19baedc2bb8ac2df715c
Raw diff: https://github.com/php/php-src/commit/f47b7f1c704b87acbdea19baedc2bb8ac2df715c.diff
Cleanup name handling in magic methods (#13733)
The copy was introduced in bc59289b7, and later changed in 57527455eb,
to prevent indirect modifications of magic method arguments.
This is no longer necessary because we no longer deal with zvals, but
with string directly that the VM has retrieved either as a constant, or
via zval_try_get_tmp_string().
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 80f99ae01fa0..f72cb76489ab 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -610,7 +610,6 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
uintptr_t property_offset;
const zend_property_info *prop_info = NULL;
uint32_t *guard = NULL;
- zend_string *tmp_name = NULL;
#if DEBUG_OBJECT_HANDLERS
fprintf(stderr, "Read object #%d property: %s\n", zobj->handle, ZSTR_VAL(name));
@@ -692,9 +691,6 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
guard = zend_get_property_guard(zobj, name);
if (!((*guard) & IN_ISSET)) {
- if (!tmp_name && !ZSTR_IS_INTERNED(name)) {
- tmp_name = zend_string_copy(name);
- }
GC_ADDREF(zobj);
ZVAL_UNDEF(&tmp_result);
@@ -769,8 +765,6 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
retval = &EG(uninitialized_zval);
exit:
- zend_tmp_string_release(tmp_name);
-
return retval;
}
/* }}} */
@@ -1822,7 +1816,6 @@ ZEND_API int zend_std_has_property(zend_object *zobj, zend_string *name, int
has
zval *value = NULL;
uintptr_t property_offset;
const zend_property_info *prop_info = NULL;
- zend_string *tmp_name = NULL;
property_offset = zend_get_property_offset(zobj->ce, name, 1, cache_slot, &prop_info);
@@ -1887,9 +1880,6 @@ ZEND_API int zend_std_has_property(zend_object *zobj, zend_string *name, int
has
zval rv;
/* have issetter - try with it! */
- if (!tmp_name && !ZSTR_IS_INTERNED(name)) {
- tmp_name = zend_string_copy(name);
- }
GC_ADDREF(zobj);
(*guard) |= IN_ISSET; /* prevent circular getting */
zend_std_call_issetter(zobj, name, &rv);
@@ -1912,7 +1902,6 @@ ZEND_API int zend_std_has_property(zend_object *zobj, zend_string *name, int
has
}
exit:
- zend_tmp_string_release(tmp_name);
return result;
}
/* }}} */