archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleanup name handling in magic methods (#13733)

Browse source 
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().
This commit is contained in:
Niels Dossche 2024-03-18 17:48:12 +01:00 • committed by GitHub
parent 805326fe18
commit f47b7f1c70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Zend/zend_object_handlers.c
View file

@ -610,7 +610,6 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
uintptr_t property_offset; uintptr_t property_offset;
const zend_property_info *prop_info = NULL; const zend_property_info *prop_info = NULL;
uint32_t *guard = NULL; uint32_t *guard = NULL;
zend_string *tmp_name = NULL;
#if DEBUG_OBJECT_HANDLERS #if DEBUG_OBJECT_HANDLERS
fprintf(stderr, "Read object #%d property: %s\n", zobj->handle, ZSTR_VAL(name)); 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); guard = zend_get_property_guard(zobj, name);
if (!((*guard) & IN_ISSET)) { if (!((*guard) & IN_ISSET)) {
if (!tmp_name && !ZSTR_IS_INTERNED(name)) {
tmp_name = zend_string_copy(name);
}
GC_ADDREF(zobj); GC_ADDREF(zobj);
ZVAL_UNDEF(&tmp_result); ZVAL_UNDEF(&tmp_result);
@ -769,8 +765,6 @@ uninit_error:
retval = &EG(uninitialized_zval); retval = &EG(uninitialized_zval);
exit: exit:
zend_tmp_string_release(tmp_name);
return retval; return retval;
} }
/* }}} */ /* }}} */
@ -1822,7 +1816,6 @@ ZEND_API int zend_std_has_property(zend_object *zobj, zend_string *name, int has
zval *value = NULL; zval *value = NULL;
uintptr_t property_offset; uintptr_t property_offset;
const zend_property_info *prop_info = NULL; 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); property_offset = zend_get_property_offset(zobj->ce, name, 1, cache_slot, &prop_info);
@ -1887,9 +1880,6 @@ found:
zval rv; zval rv;
/* have issetter - try with it! */ /* have issetter - try with it! */
if (!tmp_name && !ZSTR_IS_INTERNED(name)) {
tmp_name = zend_string_copy(name);
}
GC_ADDREF(zobj); GC_ADDREF(zobj);
(*guard) |= IN_ISSET; /* prevent circular getting */ (*guard) |= IN_ISSET; /* prevent circular getting */
zend_std_call_issetter(zobj, name, &rv); zend_std_call_issetter(zobj, name, &rv);
@ -1912,7 +1902,6 @@ found:
} }
exit: exit:
zend_tmp_string_release(tmp_name);
return result; return result;
} }
/* }}} */ /* }}} */