archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix leak when setting cyclic previous exception in finally
This commit is contained in:
Nikita Popov 2020-06-30 12:25:29 +02:00
commit 0fa70b3cde
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/tests/exception_set_previous_leak.phpt Normal file
View file

@ -0,0 +1,20 @@
--TEST--
Leak when setting recursive previous exception in finally handling
--FILE--
<?php
try {
try {
throw new Exception("Test");
} catch (Exception $e) {
throw $e;
} finally {
throw $e;
}
} catch (Exception $e2) {
echo $e2->getMessage(), "\n";
}
?>
--EXPECT--
Test

8
Zend/zend_exceptions.c
View file

@ -76,9 +76,15 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo
zval pv, zv, rv; zval pv, zv, rv;
zend_class_entry *base_ce; zend_class_entry *base_ce;
if (exception == add_previous || !add_previous || !exception) { if (!exception || !add_previous) {
return; return;
} }
if (exception == add_previous) {
OBJ_RELEASE(add_previous);
return;
}
ZVAL_OBJ(&pv, add_previous); ZVAL_OBJ(&pv, add_previous);
if (!instanceof_function(Z_OBJCE(pv), zend_ce_throwable)) { if (!instanceof_function(Z_OBJCE(pv), zend_ce_throwable)) {
zend_error_noreturn(E_CORE_ERROR, "Previous exception must implement Throwable"); zend_error_noreturn(E_CORE_ERROR, "Previous exception must implement Throwable");