cvs: ZendEngine2 / zend_execute_API.c
| From: | Andi Gutmans | Date: | Tue, 13 Aug 2002 16:46:40 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-310@lists.php.net to get a copy of this message | ||
andi Tue Aug 13 12:46:40 2002 EDT
Modified files:
/ZendEngine2 zend_execute_API.c
Log:
- Fix crash when exception is raised in __autoload function
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.168 ZendEngine2/zend_execute_API.c:1.169
--- ZendEngine2/zend_execute_API.c:1.168 Sat Jul 27 11:53:14 2002
+++ ZendEngine2/zend_execute_API.c Tue Aug 13 12:46:40 2002
@@ -670,6 +670,11 @@
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);