Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 1b49d0eb589a · 2025-09-05T18:57:26.000+02:00
* PHP-8.3:
  Fix memory leak in zip when encountering empty glob result
diff --git a/NEWS b/NEWS
@@ -50,6 +50,9 @@ PHP                                                                        NEWS
   . Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata().
     (nielsdos)
 
+- Zip:
+  . Fix memory leak in zip when encountering empty glob result. (nielsdos)
+
 28 Aug 2025, PHP 8.4.12
 
 - Core:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -667,7 +667,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 			   can be used for simple glob() calls without further error
 			   checking.
 			*/
-			array_init(return_value);
 			return 0;
 		}
 #endif
@@ -676,7 +675,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-		array_init(return_value);
 		return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`667`	`667`	`can be used for simple glob() calls without further error`
`668`	`668`	`checking.`
`669`	`669`	`*/`
`670`		`- array_init(return_value);`
`671`	`670`	`return 0;`
`672`	`671`	`}`
`673`	`672`	`#endif`
`@@ -676,7 +675,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`676`	`675`
`677`	`676`	`/* now catch the FreeBSD style of "no matches" */`
`678`	`677`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`679`		`- array_init(return_value);`
`680`	`678`	`return 0;`
`681`	`679`	`}`
`682`	`680`