]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 30 Jun 2020 10:26:03 +0000 (12:26 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 30 Jun 2020 10:26:03 +0000 (12:26 +0200)
* PHP-7.4:
  Fix leak when setting cyclic previous exception in finally

1  2 
Zend/zend_exceptions.c

index 63f994e580fe5922cf2ad10b8e5f766ce7947666,2d52e4e49e05fcea614d3906c5dc8e7ccabd783f..c66a91899379e0174035559a0083af1330ac2803
@@@ -85,7 -80,7 +85,7 @@@ void zend_exception_set_previous(zend_o
                return;
        }
  
-       if (zend_is_unwind_exit(add_previous)) {
 -      if (exception == add_previous) {
++      if (exception == add_previous || zend_is_unwind_exit(add_previous)) {
                OBJ_RELEASE(add_previous);
                return;
        }