com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_b uiltin_functions.c
| From: | Joe Watkins | Date: | Mon, 23 Jan 2017 05:34:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_b uiltin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96846@lists.php.net to get a copy of this message | ||
Commit: 5589df128cd7f98c48f5d2c1c154eb927f84f53c
Author: Joe Watkins <krakjoe@php.net> Mon, 23 Jan 2017 05:34:21 +0000
Parents: 8bda5420648021dd6f92bac45915d6422b636df3 d636467937fcfbd708f2b06c9e060bcbe9a63679
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5589df128cd7f98c48f5d2c1c154eb927f84f53c
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move decl to correct place
Changed paths:
MM Zend/zend_builtin_functions.c
Diff:
diff --cc Zend/zend_builtin_functions.c
index d6941da,547d3f0..8d0a41c
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@@ -2443,11 -2361,12 +2443,12 @@@ ZEND_FUNCTION(debug_print_backtrace
}
/* $this may be passed into regular internal functions */
- object = Z_OBJ(call->This);
+ object = (Z_TYPE(call->This) == IS_OBJECT) ? Z_OBJ(call->This) : NULL;
if (call->func) {
- func = call->func;
zend_string *zend_function_name;
+
+ func = call->func;
if (func->common.scope && func->common.scope->trait_aliases) {
zend_function_name = zend_resolve_method_name(object ? object->ce :
func->common.scope, func);
} else {