Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  phar: Fix memory leak of argument in webPhar

Author: ndossche

NEWS

@@ -17,6 +17,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-20081 (access to uninitialized vars in preload_load()).
     (Arnaud)
 
+- Phar:
+  . Fix memory leak of argument in webPhar. (nielsdos)
+
 - Random:
   . Fix Randomizer::__serialize() w.r.t. INDIRECTs. (nielsdos)
 

ext/phar/phar_object.c

@@ -697,12 +697,15 @@ PHP_METHOD(Phar, webPhar)
 		rewrite_fci.retval = &retval;
 
 		if (FAILURE == zend_call_function(&rewrite_fci, &rewrite_fcc)) {
+			zval_ptr_dtor_str(&params);
 			if (!EG(exception)) {
 				zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: failed to call rewrite callback");
 			}
 			goto cleanup_fail;
 		}
 
+		zval_ptr_dtor_str(&params);
+
 		if (Z_TYPE_P(rewrite_fci.retval) == IS_UNDEF || Z_TYPE(retval) == IS_UNDEF) {
 			zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
 			goto cleanup_fail;
@@ -728,7 +731,6 @@ PHP_METHOD(Phar, webPhar)
 				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);
 				}