summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2004-01-05 12:10:35 +0000
committerStanislav Malyshev <stas@php.net>2004-01-05 12:10:35 +0000
commitbced21b357eb3f66c9ca98b2ff5f7bcade7015d3 (patch)
treefc71a0ce875db0c84d6a198344fba92386b527ff
parent1e11e7401c965e573e03eff151050e68953ed51a (diff)
downloadphp-git-bced21b357eb3f66c9ca98b2ff5f7bcade7015d3.tar.gz
Fix bug #26543 - check parent:: and self:: in class names
-rw-r--r--Zend/zend_API.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3bb972545f..5cf978fb2a 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1631,7 +1631,7 @@ ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char
if (syntax_only)
return 1;
- lcname = zend_str_tolower_dup(Z_STRVAL_PP(method), Z_STRLEN_PP(method));
+ lcname = zend_str_tolower_dup(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj));
if (EG(active_op_array) && strcmp(lcname, "self") == 0) {
ce = EG(active_op_array)->scope;
@@ -1643,7 +1643,7 @@ ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char
efree(lcname);
} else {
- ce = Z_OBJCE_PP(obj); /* ??? */
+ ce = Z_OBJCE_PP(obj); /* TBFixed: what if it's overloaded? */
if (callable_name) {
char *ptr;