Fix memory leak in zip when encountering empty glob result

remicollet · remicollet · commit 93046609eae6 · 2025-09-18T11:08:36.000+02:00
From php/php-src@216e87a
diff --git a/php5/php_zip.c b/php5/php_zip.c
@@ -706,7 +706,6 @@ int php_zip_glob(char *pattern, int pattern_len, long flags, zval *return_value
 			   can be used for simple glob() calls without further error
 			   checking.
 			*/
-			array_init(return_value);
 			return 0;
 		}
 #endif
@@ -715,7 +714,6 @@ int php_zip_glob(char *pattern, int pattern_len, long flags, zval *return_value
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-		array_init(return_value);
 		return 0;
 	}
 
diff --git a/php7/php_zip.c b/php7/php_zip.c
@@ -668,7 +668,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
@@ -677,7 +676,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;
 	}
 
diff --git a/php73/php_zip.c b/php73/php_zip.c
@@ -668,7 +668,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
@@ -677,7 +676,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;
 	}
 
diff --git a/php74/php_zip.c b/php74/php_zip.c
@@ -664,7 +664,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
@@ -673,7 +672,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;
 	}
 
diff --git a/php8/php_zip.c b/php8/php_zip.c
@@ -674,7 +674,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
@@ -683,7 +682,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;
 	}
 
diff --git a/php81/php_zip.c b/php81/php_zip.c
@@ -676,7 +676,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
@@ -685,7 +684,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;
 	}
 
diff --git a/php85/php_zip.c b/php85/php_zip.c
@@ -628,7 +628,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
@@ -637,7 +636,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
`@@ -706,7 +706,6 @@ int php_zip_glob(char pattern, int pattern_len, long flags, zval return_value`
`706`	`706`	`can be used for simple glob() calls without further error`
`707`	`707`	`checking.`
`708`	`708`	`*/`
`709`		`- array_init(return_value);`
`710`	`709`	`return 0;`
`711`	`710`	`}`
`712`	`711`	`#endif`
`@@ -715,7 +714,6 @@ int php_zip_glob(char pattern, int pattern_len, long flags, zval return_value`
`715`	`714`
`716`	`715`	`/* now catch the FreeBSD style of "no matches" */`
`717`	`716`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`718`		`- array_init(return_value);`
`719`	`717`	`return 0;`
`720`	`718`	`}`
`721`	`719`
Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`668`	`668`	`can be used for simple glob() calls without further error`
`669`	`669`	`checking.`
`670`	`670`	`*/`
`671`		`- array_init(return_value);`
`672`	`671`	`return 0;`
`673`	`672`	`}`
`674`	`673`	`#endif`
`@@ -677,7 +676,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`677`	`676`
`678`	`677`	`/* now catch the FreeBSD style of "no matches" */`
`679`	`678`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`680`		`- array_init(return_value);`
`681`	`679`	`return 0;`
`682`	`680`	`}`
`683`	`681`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`664`	`664`	`can be used for simple glob() calls without further error`
`665`	`665`	`checking.`
`666`	`666`	`*/`
`667`		`- array_init(return_value);`
`668`	`667`	`return 0;`
`669`	`668`	`}`
`670`	`669`	`#endif`
`@@ -673,7 +672,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`673`	`672`
`674`	`673`	`/* now catch the FreeBSD style of "no matches" */`
`675`	`674`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`676`		`- array_init(return_value);`
`677`	`675`	`return 0;`
`678`	`676`	`}`
`679`	`677`
Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`674`	`674`	`can be used for simple glob() calls without further error`
`675`	`675`	`checking.`
`676`	`676`	`*/`
`677`		`- array_init(return_value);`
`678`	`677`	`return 0;`
`679`	`678`	`}`
`680`	`679`	`#endif`
`@@ -683,7 +682,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`683`	`682`
`684`	`683`	`/* now catch the FreeBSD style of "no matches" */`
`685`	`684`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`686`		`- array_init(return_value);`
`687`	`685`	`return 0;`
`688`	`686`	`}`
`689`	`687`
Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`676`	`676`	`can be used for simple glob() calls without further error`
`677`	`677`	`checking.`
`678`	`678`	`*/`
`679`		`- array_init(return_value);`
`680`	`679`	`return 0;`
`681`	`680`	`}`
`682`	`681`	`#endif`
`@@ -685,7 +684,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`685`	`684`
`686`	`685`	`/* now catch the FreeBSD style of "no matches" */`
`687`	`686`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`688`		`- array_init(return_value);`
`689`	`687`	`return 0;`
`690`	`688`	`}`
`691`	`689`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`628`	`628`	`can be used for simple glob() calls without further error`
`629`	`629`	`checking.`
`630`	`630`	`*/`
`631`		`- array_init(return_value);`
`632`	`631`	`return 0;`
`633`	`632`	`}`
`634`	`633`	`#endif`
`@@ -637,7 +636,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`637`	`636`
`638`	`637`	`/* now catch the FreeBSD style of "no matches" */`
`639`	`638`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`640`		`- array_init(return_value);`
`641`	`639`	`return 0;`
`642`	`640`	`}`
`643`	`641`