com php-src: Only check user functions for filenames.: Zend/zend_compile.c
| From: | Ferenc Kovacs | Date: | Sat, 09 Nov 2013 02:49:05 +0000 |
| Subject: | com php-src: Only check user functions for filenames.: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74289@lists.php.net to get a copy of this message | ||
Commit: cc049e64500ed0f6efd9e6827e4bda1b23368c61
Author: Adam Harvey <aharvey@php.net> Fri, 8 Nov 2013 21:49:05 -0500
Parents: da553a816653e7c19bbfb5454fced91b929a6075
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc049e64500ed0f6efd9e6827e4bda1b23368c61
Log:
Only check user functions for filenames.
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 96fb77a..14a28f3 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7209,7 +7209,7 @@ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int
i
} else if (is_function) {
zend_function *function;
- if (zend_hash_find(lookup_table, lookup_name, Z_STRLEN_P(name)+1, (void **) &function) ==
SUCCESS && strcmp(function->op_array.filename, CG(compiled_filename)) == 0) {
+ if (zend_hash_find(lookup_table, lookup_name, Z_STRLEN_P(name)+1, (void **) &function) ==
SUCCESS && function->type == ZEND_USER_FUNCTION &&
strcmp(function->op_array.filename, CG(compiled_filename)) == 0) {
char *c_tmp = zend_str_tolower_dup(Z_STRVAL_P(ns), Z_STRLEN_P(ns));
if (Z_STRLEN_P(ns) != Z_STRLEN_P(name) ||