diff options
| author | Anatol Belski <ab@php.net> | 2013-05-12 14:00:32 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-12 14:00:32 +0200 |
| commit | d6505acbf5ff6db0e9e19cdba121183d9563bad5 (patch) | |
| tree | 3fe70313b5944a957456caec925904ad039fc147 /Zend/zend_exceptions.c | |
| parent | 1cc2162b835ff6bcb8650b9522f54d266576401e (diff) | |
| download | php-git-d6505acbf5ff6db0e9e19cdba121183d9563bad5.tar.gz | |
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 08a8dbaa05..6a20b843c9 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -803,6 +803,10 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* { if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) { file = zend_read_property(default_exception_ce, EG(exception), "file", sizeof("file")-1, 1 TSRMLS_CC); line = zend_read_property(default_exception_ce, EG(exception), "line", sizeof("line")-1, 1 TSRMLS_CC); + + convert_to_string(file); + file = (Z_STRLEN_P(file) > 0) ? file : NULL; + line = (Z_TYPE_P(line) == IS_LONG) ? line : NULL; } else { file = NULL; line = NULL; @@ -814,7 +818,11 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* { file = zend_read_property(default_exception_ce, exception, "file", sizeof("file")-1, 1 TSRMLS_CC); line = zend_read_property(default_exception_ce, exception, "line", sizeof("line")-1, 1 TSRMLS_CC); - zend_error_va(severity, Z_STRVAL_P(file), Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str)); + convert_to_string(str); + convert_to_string(file); + convert_to_long(line); + + zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str)); } else { zend_error(severity, "Uncaught exception '%s'", ce_exception->name); } |