diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-20 16:38:00 +0800 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-11-19 19:25:05 +0100 |
| commit | cbb3f7f15ac95ec173498391382910f82622ea62 (patch) | |
| tree | 2560c466587696fc507b68a15b1135a2382ffa17 | |
| parent | 01b88f87ba3638297f0f9afb2352c3acdeb18e42 (diff) | |
| download | php-git-cbb3f7f15ac95ec173498391382910f82622ea62.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_exceptions.c
| -rw-r--r-- | Zend/tests/bug70944.phpt | 16 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 10 |
2 files changed, 25 insertions, 1 deletions
diff --git a/Zend/tests/bug70944.phpt b/Zend/tests/bug70944.phpt new file mode 100644 index 0000000000..f14af65166 --- /dev/null +++ b/Zend/tests/bug70944.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #70944 (try{ } finally{} can create infinite chains of exceptions) +--FILE-- +<?php +$e = new Exception("Bar"); +try { + throw new Exception("Foo", 0, $e); +} finally { + throw $e; +} +?> +--EXPECTF-- +Fatal error: Uncaught Exception: Bar in %sbug70944.php:%d +Stack trace: +#0 {main} + thrown in %sbug70944.php on line %d diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 002f519bc6..dd137dfb95 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -70,7 +70,8 @@ ZEND_API zend_class_entry *zend_get_exception_base(zval *object) void zend_exception_set_previous(zend_object *exception, zend_object *add_previous) { - zval tmp, *previous, zv, *pzv, rv; + zval *previous, *pzv; + zval tmp, zv, rv; zend_class_entry *base_ce; if (exception == add_previous || !add_previous || !exception) { @@ -81,6 +82,13 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo zend_error_noreturn(E_CORE_ERROR, "Previous exception must implement Throwable"); return; } + pzv = zend_read_property(i_get_exception_base(&tmp), &tmp, "previous", sizeof("previous")-1, 1, &rv); + while (Z_TYPE_P(pzv) == IS_OBJECT) { + if (Z_OBJ_P(pzv) == exception) { + return; + } + pzv = zend_read_property(i_get_exception_base(pzv), pzv, "previous", sizeof("previous")-1, 1, &rv); + } ZVAL_OBJ(&zv, exception); pzv = &zv; do { |