Commit 1b49d0e

committed

Merge branch 'PHP-8.3' into PHP-8.4

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

2 parents 924eea4 + 216e87a commit 1b49d0eCopy full SHA for 1b49d0e

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ PHP NEWS`
`50`	`50`	`. Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata().`
`51`	`51`	`(nielsdos)`
`52`	`52`
	`53`	`+- Zip:`
	`54`	`+ . Fix memory leak in zip when encountering empty glob result. (nielsdos)`
	`55`	`+`
`53`	`56`	`28 Aug 2025, PHP 8.4.12`
`54`	`57`
`55`	`58`	`- Core:`

Lines changed: 0 additions & 2 deletions

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`

Comments

(0)