diff options
| author | Marcus Boerger <helly@php.net> | 2003-08-24 15:07:00 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-08-24 15:07:00 +0000 |
| commit | 4e5e7502b8801f889962c514803071d71362a092 (patch) | |
| tree | 1eaa13870053d861575e3eb604eb7733a99de611 /Zend/zend_default_classes.c | |
| parent | aa632187cd869dad09369f0b3200a1b75c8fe26e (diff) | |
| download | php-git-4e5e7502b8801f889962c514803071d71362a092.tar.gz | |
Allow to throw instances of classes derived from exception
Diffstat (limited to 'Zend/zend_default_classes.c')
| -rw-r--r-- | Zend/zend_default_classes.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c index a00d261ea7..116dbabe19 100644 --- a/Zend/zend_default_classes.c +++ b/Zend/zend_default_classes.c @@ -136,18 +136,27 @@ ZEND_API zend_class_entry *zend_exception_get_default(void) return default_exception_ptr; } -ZEND_API void zend_throw_exception(char *message, long code TSRMLS_DC) +ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC) { zval *ex; MAKE_STD_ZVAL(ex); - object_init_ex(ex, default_exception_ptr); + if (exception_ce) { + if (!instanceof_function(exception_ce, default_exception_ptr TSRMLS_CC)) { + zend_error(E_NOTICE, "Exceptions must be derived from exception"); + exception_ce = default_exception_ptr; + } + } else { + exception_ce = default_exception_ptr; + } + object_init_ex(ex, exception_ce); + if (message) { - zend_update_property_string(default_exception_ptr, ex, "message", sizeof("message")-1, message TSRMLS_CC); + zend_update_property_string(exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC); } if (code) { - zend_update_property_long(default_exception_ptr, ex, "code", sizeof("code")-1, code TSRMLS_CC); + zend_update_property_long(exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC); } EG(exception) = ex; |