diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-05-31 11:57:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-05-31 11:57:22 +0300 |
| commit | f2b4ec4bdc595773fb49b7d6ae8942c61f436288 (patch) | |
| tree | 528873c7a446929a9298aaaaad4b6cef805fdc69 /Zend/zend_builtin_functions.c | |
| parent | 0d72bb8fcb0b2d658f9a40e473207f4a1f66df91 (diff) | |
| download | php-git-f2b4ec4bdc595773fb49b7d6ae8942c61f436288.tar.gz | |
Export standard object handlers, to avoid indirect access
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index ac6a460ed6..c2380f622b 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2290,7 +2290,7 @@ ZEND_FUNCTION(debug_print_backtrace) if (object) { if (func->common.scope) { class_name = func->common.scope->name; - } else if (object->handlers->get_class_name == std_object_handlers.get_class_name) { + } else if (object->handlers->get_class_name == zend_std_get_class_name) { class_name = object->ce->name; } else { class_name = object->handlers->get_class_name(object); @@ -2355,7 +2355,7 @@ ZEND_FUNCTION(debug_print_backtrace) ZEND_PUTS(call_type); if (object && !func->common.scope - && object->handlers->get_class_name != std_object_handlers.get_class_name) { + && object->handlers->get_class_name != zend_std_get_class_name) { zend_string_release_ex(class_name, 0); } } @@ -2522,7 +2522,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int if (object) { if (func->common.scope) { ZVAL_STR_COPY(&tmp, func->common.scope->name); - } else if (object->handlers->get_class_name == std_object_handlers.get_class_name) { + } else if (object->handlers->get_class_name == zend_std_get_class_name) { ZVAL_STR_COPY(&tmp, object->ce->name); } else { ZVAL_STR(&tmp, object->handlers->get_class_name(object)); |