diff options
| author | Anatol Belski <ab@php.net> | 2013-05-12 14:06:59 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-12 14:06:59 +0200 |
| commit | dd188e9538a83473246d94642a7ce577fc5de33b (patch) | |
| tree | e2aefc682dda8a92ab5edea7c8f5f24c9f23f2e3 | |
| parent | 699dc04c5597a6dbd5d4fac43096d01ea37e6069 (diff) | |
| parent | d6505acbf5ff6db0e9e19cdba121183d9563bad5 (diff) | |
| download | php-git-dd188e9538a83473246d94642a7ce577fc5de33b.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
| -rw-r--r-- | Zend/tests/bug64821.1.phpt | 22 | ||||
| -rw-r--r-- | Zend/tests/bug64821.2.phpt | 19 | ||||
| -rw-r--r-- | Zend/tests/bug64821.3.phpt | 20 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 10 |
4 files changed, 70 insertions, 1 deletions
diff --git a/Zend/tests/bug64821.1.phpt b/Zend/tests/bug64821.1.phpt new file mode 100644 index 0000000000..5e2093c472 --- /dev/null +++ b/Zend/tests/bug64821.1.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #64821 Custom Exceptions crash when internal properties overridden (variation 1) +--FILE-- +<?php + +class a extends exception { + public function __construct() { + $this->message = NULL; + $this->string = NULL; + $this->code = array(); + $this->line = "hello"; + } +} + +throw new a; + +?> +--EXPECTF-- +Fatal error: Uncaught exception 'a' in %s:0 +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/Zend/tests/bug64821.2.phpt b/Zend/tests/bug64821.2.phpt new file mode 100644 index 0000000000..91a43f500b --- /dev/null +++ b/Zend/tests/bug64821.2.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #64821 Custom Exceptions crash when internal properties overridden (variation 2) +--FILE-- +<?php + +class a extends exception { + public function __construct() { + $this->line = array(); + } +} + +throw new a; + +?> +--EXPECTF-- +Fatal error: Uncaught exception 'a' in %s:0 +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/Zend/tests/bug64821.3.phpt b/Zend/tests/bug64821.3.phpt new file mode 100644 index 0000000000..9e96075d49 --- /dev/null +++ b/Zend/tests/bug64821.3.phpt @@ -0,0 +1,20 @@ +--TEST-- +Bug #64821 Custom Exceptions crash when internal properties overridden (variation 3) +--FILE-- +<?php + +class a extends exception { + public function __construct() { + $this->line = array(); + $this->file = NULL; + } +} + +throw new a; + +?> +--EXPECTF-- +Fatal error: Uncaught exception 'a' in :0 +Stack trace: +#0 {main} + thrown in Unknown on line %d diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index f457b2846f..f07c1135f0 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -817,6 +817,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; @@ -828,7 +832,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); } |