Skip to content

[pull] master from php:master #1262

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
Sep 11, 2026
+49 −12
Merged

[pull] master from php:master #1262

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
214ed7e
ext/zip: ZipArchive::extractTo() ignores files given in a non-list array
devnexen Sep 10, 2026
7184093
Merge branch 'PHP-8.4' into PHP-8.5
devnexen Sep 11, 2026
04c41f0
Merge branch 'PHP-8.5'
devnexen Sep 11, 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
23 changes: 11 additions & 12 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,7 +2920,7 @@ PHP_METHOD(ZipArchive, extractTo)
}
}

uint32_t nelems, i;
uint32_t nelems;
ZIP_FROM_OBJECT(intern, self);

if (files_str) {
Expand All @@ -2932,19 +2932,18 @@ PHP_METHOD(ZipArchive, extractTo)
if (nelems == 0 ) {
RETURN_FALSE;
}
for (i = 0; i < nelems; i++) {
zval *zval_file;
if ((zval_file = zend_hash_index_find_deref(files_ht, i)) != NULL) {
if (Z_TYPE_P(zval_file) == IS_STRING) {
if (!php_zip_extract_file(intern, pathto, Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), -1)) {
RETURN_FALSE;
}
} else {
zend_argument_type_error(2, "must only have elements of type string, %s given", zend_zval_value_name(zval_file));
RETURN_THROWS();
zval *zval_file;
ZEND_HASH_FOREACH_VAL(files_ht, zval_file) {
ZVAL_DEREF(zval_file);
if (Z_TYPE_P(zval_file) == IS_STRING) {
if (!php_zip_extract_file(intern, pathto, Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), -1)) {
RETURN_FALSE;
}
} else {
zend_argument_type_error(2, "must only have elements of type string, %s given", zend_zval_value_name(zval_file));
RETURN_THROWS();
}
}
} ZEND_HASH_FOREACH_END();
} else {
/* Extract all files */
zip_int64_t i, filecount = zip_get_num_entries(intern, 0);
Expand Down
38 changes: 38 additions & 0 deletions ext/zip/tests/oo_extract_array_keys.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
ZipArchive::extractTo() with a non-list files array (non-sequential keys)
--EXTENSIONS--
zip
--FILE--
<?php
$archive = __DIR__ . "/oo_extract_array_keys.zip";

$zip = new ZipArchive();
$zip->open($archive, ZipArchive::CREATE | ZipArchive::OVERWRITE);
$zip->addFromString("file0.txt", "zero");
$zip->addFromString("file1.txt", "one");
$zip->close();

$target = __DIR__ . "/oo_extract_array_keys";
mkdir($target);

// array_filter() (and array_unique/array_diff) preserve keys, so this is [1 => "file1.txt"],
// a perfectly valid list of entry names that is not a packed 0-based array.
$files = array_filter(["file0.txt", "file1.txt"], fn($f) => $f === "file1.txt");

$zip = new ZipArchive();
$zip->open($archive);
var_dump($zip->extractTo($target, $files));
$zip->close();

var_dump(is_file("$target/file1.txt"));
?>
--EXPECT--
bool(true)
bool(true)
--CLEAN--
<?php
@unlink(__DIR__ . "/oo_extract_array_keys.zip");
$target = __DIR__ . "/oo_extract_array_keys";
@unlink("$target/file1.txt");
@rmdir($target);
?>