Skip to content

[pull] master from php:master #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jul 3, 2026
+38 −1
Merged

[pull] master from php:master #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc3a7c7
Fix GH-21705: ZipArchive::getFromIndex() ignores FL_UNCHANGED (#21706)
LamentXU123 Jul 3, 2026
c0f01b3
Merge branch 'PHP-8.4' into PHP-8.5
LamentXU123 Jul 3, 2026
041ef84
Merge branch 'PHP-8.5'
LamentXU123 Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ PHP NEWS
. Fixed bug GH-21468 (Segfault in file_get_contents w/ a https URL
and a proxy set). (CVE-2026-12184) (ndossche)

- Zip:
. Fixed bug GH-21705 (ZipArchive::getFromIndex() ignores
ZipArchive::FL_UNCHANGED for deleted entries). (Weilin Du)

02 Jul 2026, PHP 8.6.0alpha1

- Core:
Expand Down
2 changes: 1 addition & 1 deletion ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2870,7 +2870,7 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */

ZIP_FROM_OBJECT(intern, self);

PHP_ZIP_STAT_INDEX(intern, index, 0, sb);
PHP_ZIP_STAT_INDEX(intern, index, flags, sb);
}

if (sb.size < 1) {
Expand Down
33 changes: 33 additions & 0 deletions ext/zip/tests/bug_gh21705.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
ZipArchive::getFromIndex() honors FL_UNCHANGED for deleted entries
--EXTENSIONS--
zip
--FILE--
<?php
$name = __DIR__ . '/bug_gh21705.zip';
@unlink($name);
$zip = new ZipArchive;
$zip->open($name, ZipArchive::CREATE);
$zip->addFromString('foo.txt', 'foo');
$zip->addFromString('bar.txt', 'bar');
$zip->close();

$zip = new ZipArchive;
$zip->open($name);

$index = $zip->locateName('bar.txt');
$zip->deleteName('bar.txt');

var_dump($zip->getFromName('bar.txt', 0, ZipArchive::FL_UNCHANGED));
var_dump($zip->getFromIndex($index, 0, ZipArchive::FL_UNCHANGED));

$zip->close();
?>
--CLEAN--
<?php
$name = __DIR__ . '/bug_gh21705.zip';
@unlink($name);
?>
--EXPECT--
string(3) "bar"
string(3) "bar"