From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 30 Jun 2020 10:26:03 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5e8c9865e7027a49fbf4646e72d950d86fcf192;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix leak when setting cyclic previous exception in finally
---

c5e8c9865e7027a49fbf4646e72d950d86fcf192
diff --cc Zend/zend_exceptions.c
index 63f994e580,2d52e4e49e..c66a918993
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -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;
  	}