ext/zip: use php_globfree wrapper in addGlob early returns#21709
Closed
iliaal wants to merge 1 commit intophp:PHP-8.5from
Closed
ext/zip: use php_globfree wrapper in addGlob early returns#21709iliaal wants to merge 1 commit intophp:PHP-8.5from
iliaal wants to merge 1 commit intophp:PHP-8.5from
Conversation
Member
|
ah you were faster but please target PHP-8.5 |
iliaal
requested review from
DanielEScherzer,
Girgias,
NattyNarwhal,
SakiTakamachi,
TimWolla,
adoy,
alexdowad,
arnaud-lb,
bukka,
derickr,
devnexen,
dstogov,
kamil-tekiela,
kocsismate,
ndossche,
youkidearitai and
zeriyoshi
as code owners
phpGH-21702 added two `globfree()` calls at the no-match and open_basedir reject paths, but called `globfree` directly instead of the `php_globfree` wrapper used at the success path below. PHP-8.5 dropped the direct `<glob.h>` include from `ext/zip/php_zip.c` in favor of the `php_glob.h` wrapper, so the build now breaks with `-Werror=implicit-function-declaration` on systems where `<glob.h>` isn't transitively included. Match the existing wrapper usage at line 675.
devnexen
removed request for
NattyNarwhal,
TimWolla,
adoy,
alexdowad,
arnaud-lb,
bukka,
derickr,
dstogov and
youkidearitai
devnexen
removed request for
DanielEScherzer,
Girgias,
SakiTakamachi,
kamil-tekiela,
kocsismate,
ndossche and
zeriyoshi
iliaal
force-pushed
the
fix/zip-globfree-wrapper
branch
from
8388516 to
dbccbde
Compare
devnexen
approved these changes
Apr 10, 2026
Contributor
Author
Only because I was watching my PR break, thinking I broke something 😅 Rebased on 8.5. |
Member
|
Thanks a mil ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Master fails to build on ALPINE_X64_ASAN_DEBUG_ZTS, LINUX_X64_ASAN_DEBUG_ZTS, LINUX_X64_RELEASE_NTS, MACOS_ARM64_DEBUG_NTS, and FREEBSD_NTS with:
GH-21702 added two
globfree(&globbuf)calls atext/zip/php_zip.c:679and:686for the no-match and open_basedir reject paths. I switched both tophp_globfree(), matching the existing call at line 715 and themain/php_glob.hconvention.Two-line change. Fixes the build on affected platforms without touching behavior.