diff options
| author | Andi Gutmans <andi@php.net> | 2002-08-13 16:46:40 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-08-13 16:46:40 +0000 |
| commit | 17d1c75b8be22b83f4d75e7f5ba8e3954977e94d (patch) | |
| tree | 7c01e4216c713ccfd16242b410ef7789e10de914 /Zend/zend_execute_API.c | |
| parent | d2418b11f81044616a1f174f6c6aa431eb0fdcd1 (diff) | |
| download | php-git-17d1c75b8be22b83f4d75e7f5ba8e3954977e94d.tar.gz | |
- Fix crash when exception is raised in __autoload function
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 426379bc22..bb14adf93d 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -670,6 +670,11 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry *** return FAILURE; } + if (EG(exception)) { + zend_error(E_ERROR, "__autoload threw an exception"); + } + + /* If an exception is thrown retval_ptr will be NULL but we bailout before we reach this point */ zval_ptr_dtor(&retval_ptr); return zend_hash_find(EG(class_table), name, name_length + 1, (void **) ce); |