Commit 7aff22c47f2 for php.net

commit 7aff22c47f2e6178fa0abe5f59a8527c05d9b4a4
Merge: ad1cf51972c e21aaa3b65a
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Sun Jun 7 11:10:24 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      zip: Fix leak when zip_fread() fails
      zip: Fix name leaks when path length check fails in php_zip_pcre()
      zip: Fix file descriptor leak when php_zip_add_file() fails

diff --cc ext/zip/php_zip.c
index cb2389ca437,605d561ac7e..12344450678
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -2858,9 -2911,10 +2865,10 @@@ static void php_zip_get_from(INTERNAL_F
  		RETURN_FALSE;
  	}

 -	buffer = zend_string_safe_alloc(1, len, 0, 0);
 +	buffer = zend_string_safe_alloc(1, len, 0, false);
  	zip_int64_t n = zip_fread(zf, ZSTR_VAL(buffer), ZSTR_LEN(buffer));
  	if (n < 1) {
+ 		zip_fclose(zf);
  		zend_string_efree(buffer);
  		RETURN_EMPTY_STRING();
  	}