From 17d1c75b8be22b83f4d75e7f5ba8e3954977e94d Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Tue, 13 Aug 2002 16:46:40 +0000 Subject: [PATCH] - Fix crash when exception is raised in __autoload function --- Zend/zend_execute_API.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 426379bc22c..bb14adf93d3 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);