diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:44:12 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:44:12 +0000 |
| commit | 79ed194a64a93275d680947f20d3da3e6875d548 (patch) | |
| tree | 376cfcd8f7114ac5913227ad844ec05566a8ed7b /Zend/zend_execute_API.c | |
| parent | f6536ed2b23f3c5384ba9d89fa1ef5c48c6c129d (diff) | |
| download | php-git-79ed194a64a93275d680947f20d3da3e6875d548.tar.gz | |
fix #40815 (using strings like "class::func" and static methods in set_exception_handler() might result in crash)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 95efb309e8..2fb02c421a 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -750,7 +750,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS fname = Z_STRVAL_P(fci->function_name); fname_len = Z_STRLEN_P(fci->function_name); - if (calling_scope && (colon = strstr(fname, "::")) != NULL) { + if ((colon = strstr(fname, "::")) != NULL) { int clen = colon - fname; int mlen = fname_len - clen - 2; zend_class_entry **pce, *ce_child = NULL; |