Skip to content

Fix GH-21705: ZipArchive::getFromIndex() ignores ZipArchive::FL_UNCHANGED for deleted entries #21706

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

Open
LamentXU123 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix GH-21705: ZipArchive::getFromIndex() ignores ZipArchive::FL_UNCHANGED for deleted entries #21706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d7b46c
fix 21705
LamentXU123 Apr 10, 2026
dd45a0b
make test simpler
LamentXU123 Apr 10, 2026
27b6f18
rename test file
LamentXU123 Apr 10, 2026
9bcc99b
add cleanups
LamentXU123 Apr 10, 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
Next Next commit
fix 21705
  • Loading branch information
@LamentXU123
LamentXU123 committed Apr 10, 2026
commit 0d7b46cda76f06efe0d17f68ed1e6f016bf5b94b
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 @@ -2788,7 +2788,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
41 changes: 41 additions & 0 deletions ext/zip/tests/ZipArchive_getFromIndex_unchanged_deleted.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
--TEST--
ZipArchive::getFromIndex() honors FL_UNCHANGED for deleted entries
--EXTENSIONS--
zip
--FILE--
<?php
$name = __DIR__ . '/ZipArchive_getFromIndex_unchanged_deleted.zip';

$zip = new ZipArchive;
var_dump($zip->open($name, ZipArchive::CREATE));
var_dump($zip->addFromString('foo.txt', 'foo'));
var_dump($zip->addFromString('bar.txt', 'bar'));
var_dump($zip->close());

$zip = new ZipArchive;
var_dump($zip->open($name));
$index = $zip->locateName('bar.txt');
var_dump($index);
var_dump($zip->deleteName('bar.txt'));

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

var_dump($zip->close());
?>
--CLEAN--
<?php
$name = __DIR__ . '/ZipArchive_getFromIndex_unchanged_deleted.zip';
@unlink($name);
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
int(1)
bool(true)
string(3) "bar"
string(3) "bar"
bool(true)
Loading