diff options
| author | Marcus Boerger <helly@php.net> | 2008-02-06 20:40:19 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-02-06 20:40:19 +0000 |
| commit | b7b41a6612f728d88c9fbc572ba02d595cc7479c (patch) | |
| tree | fe54f188941900d75a24cdf1c2b09654996e11a5 /Zend/zend_API.c | |
| parent | de499c965f06c64aefcfbba3cdbe386f8bea8c8c (diff) | |
| download | php-git-b7b41a6612f728d88c9fbc572ba02d595cc7479c.tar.gz | |
- MFH Fix missing check and tests
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index db63c01b74..dcf53d3bc2 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2360,7 +2360,9 @@ static int zend_is_callable_check_func(int check_flags, zval ***zobj_ptr_ptr, ze /* This is a compound name. * Try to fetch class and then find static method. */ zend_class_entry *last_scope = EG(scope); - EG(scope) = ce_org; + if (ce_org) { + EG(scope) = ce_org; + } *ce_ptr = zend_fetch_class(Z_STRVAL_P(callable), clen, ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_SILENT TSRMLS_CC); EG(scope) = last_scope; if (!*ce_ptr) { |