summaryrefslogtreecommitdiff
path: root/ext/reflection/php_reflection.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-05-31 11:57:22 +0300
committerDmitry Stogov <dmitry@zend.com>2018-05-31 11:57:22 +0300
commitf2b4ec4bdc595773fb49b7d6ae8942c61f436288 (patch)
tree528873c7a446929a9298aaaaad4b6cef805fdc69 /ext/reflection/php_reflection.c
parent0d72bb8fcb0b2d658f9a40e473207f4a1f66df91 (diff)
downloadphp-git-f2b4ec4bdc595773fb49b7d6ae8942c61f436288.tar.gz
Export standard object handlers, to avoid indirect access
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r--ext/reflection/php_reflection.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 5e71aa38f9..3cb394bdcc 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6688,8 +6688,6 @@ static const zend_function_entry reflection_ext_functions[] = { /* {{{ */
PHP_FE_END
}; /* }}} */
-static const zend_object_handlers *zend_std_obj_handlers;
-
/* {{{ _reflection_write_property */
static void _reflection_write_property(zval *object, zval *member, zval *value, void **cache_slot)
{
@@ -6703,7 +6701,7 @@ static void _reflection_write_property(zval *object, zval *member, zval *value,
}
else
{
- zend_std_obj_handlers->write_property(object, member, value, cache_slot);
+ zend_std_write_property(object, member, value, cache_slot);
}
}
/* }}} */
@@ -6712,8 +6710,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
{
zend_class_entry _reflection_entry;
- zend_std_obj_handlers = zend_get_std_object_handlers();
- memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ memcpy(&reflection_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
reflection_object_handlers.offset = XtOffsetOf(reflection_object, zo);
reflection_object_handlers.free_obj = reflection_free_objects_storage;
reflection_object_handlers.clone_obj = NULL;