Commit 556757d
Fix build: use php_globfree wrapper in ZipArchive::addGlob early returns
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.
close phpGH-217091 parent 493b59a commit 556757d
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
636 | 636 | | |
637 | 637 | | |
638 | 638 | | |
639 | | - | |
| 639 | + | |
640 | 640 | | |
641 | 641 | | |
642 | 642 | | |
643 | 643 | | |
644 | 644 | | |
645 | 645 | | |
646 | | - | |
| 646 | + | |
647 | 647 | | |
648 | 648 | | |
649 | 649 | | |
| |||
0 commit comments