Commit 216e87a

committed

Fix memory leak in zip when encountering empty glob result

The case of returning 0 is inconsistent in when it returns an empty array, furthermore the caller already returns an empty array. Because the caller overwrites the return value in these cases, it can cause a memory leak. This is easier to trigger on master in some cases as different code paths are taken with the new bundled glob. On some platforms it is also triggerable on 8.3. Closes GH-19715.

1 parent 0e668e5 commit 216e87aCopy full SHA for 216e87a

File tree

2 files changed

-2

lines changed

NEWS
ext/zip
- php_zip.c

2 files changed

-2

lines changed

`‎NEWS`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ PHP NEWS`
`52`	`52`	`deprecation and TidyInternalCategory being available later than`
`53`	`53`	`tidyOptGetCategory. (arjendekorte)`
`54`	`54`
	`55`	`+- Zip:`
	`56`	`+ . Fix memory leak in zip when encountering empty glob result. (nielsdos)`
	`57`	`+`
`55`	`58`	`28 Aug 2025, PHP 8.3.25`
`56`	`59`
`57`	`60`	`- Core:`

`‎ext/zip/php_zip.c`

Lines changed: 0 additions & 2 deletions

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`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 216e87a

File tree

2 files changed

2 files changed

`‎NEWS`

`‎ext/zip/php_zip.c`

0 commit comments