zip: Fix leak when zip_fread() fails

ndossche · ndossche · commit 17f67529fd79 · 2026-06-07T11:01:32.000+02:00
Closes GH-22238.
diff --git a/NEWS b/NEWS
@@ -31,6 +31,9 @@ PHP                                                                        NEWS
     (ndossche)
   . Fixed memory leak in inflate_add(). (ndossche)
 
+- Zip:
+  . Fixed error-related memory leaks. (ndossche)
+
 04 Jun 2026, PHP 8.4.22
 
 - Date:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -2962,6 +2962,7 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 	buffer = zend_string_safe_alloc(1, len, 0, 0);
 	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();
 	}

Original file line number	Diff line number	Diff line change
`@@ -2962,6 +2962,7 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */`
`2962`	`2962`	`buffer = zend_string_safe_alloc(1, len, 0, 0);`
`2963`	`2963`	`zip_int64_t n = zip_fread(zf, ZSTR_VAL(buffer), ZSTR_LEN(buffer));`
`2964`	`2964`	`if (n < 1) {`
	`2965`	`+ zip_fclose(zf);`
`2965`	`2966`	`zend_string_efree(buffer);`
`2966`	`2967`	`RETURN_EMPTY_STRING();`
`2967`	`2968`	`}`