Commit 8cd085a

committed

Merge branch 'PHP-8.4'

* PHP-8.4: Fix memory leak in zip when encountering empty glob result

2 parents 66eb5e7 + 1b49d0e commit 8cd085aCopy full SHA for 8cd085a

File tree

-2

lines changed

-2

lines changed

Lines changed: 0 additions & 2 deletions

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`

Comments

(0)