From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 5 Jan 2021 13:24:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afc69e46b83fdabb6561992fa742d4862f39fe04;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix memory leak in Phar::webPhar() on Windows
---

afc69e46b83fdabb6561992fa742d4862f39fe04
diff --cc ext/phar/phar_object.c
index 0cb94de993,db70f4cc71..a4965d9335
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -707,18 -731,15 +707,20 @@@ PHP_METHOD(Phar, webPhar
  				efree(pt);
  
  				zend_bailout();
- 				return;
 -				goto finish;
  			default:
 +				zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
 +
 +cleanup_fail:
 +				zval_ptr_dtor(&params);
  				if (free_pathinfo) {
  					efree(path_info);
  				}
 +				efree(entry);
  				efree(pt);
 -
 -				zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
 -				goto finish;
++#ifdef PHP_WIN32
++				efree(fname);
++#endif
 +				RETURN_THROWS();
  		}
  	}