Skip to content

misc.inc: Make validate_zip_file aware of PHP 8.4 ER_TRUNCATED_ZIP #1621

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
cpeel merged 1 commit into from
Sep 3, 2026
Merged

misc.inc: Make validate_zip_file aware of PHP 8.4 ER_TRUNCATED_ZIP #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions SETUP/tests/unittests/ZipMethodsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ public function testValidateValidEmptyZipFile(): void

public function testValidateCorruptedZipFile(): void
{
$this->expectExceptionMessage("ZipArchive::open() returned 'Zip archive inconsistent.'");
$this->expectExceptionMessageMatches(
"/^ZipArchive::open\\(\\) returned '" .
"(Zip archive inconsistent|Truncated archive)" .
"\\.'$/"
);
validate_zip_file('./data/corrupted.zip');
}

Expand Down Expand Up @@ -122,7 +126,11 @@ public function testValidateValidEmptyZipFileWithDisabledExtensionCheck(): void

public function testValidateCorruptedZipFileWithDisabledExtensionCheck(): void
{
$this->expectExceptionMessage("ZipArchive::open() returned 'Zip archive inconsistent.'");
$this->expectExceptionMessageMatches(
"/^ZipArchive::open\\(\\) returned '" .
"(Zip archive inconsistent|Truncated archive)" .
"\\.'$/"
);
validate_zip_file('./data/corrupted.zip', true);
}

Expand Down
4 changes: 4 additions & 0 deletions pinc/misc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,10 @@ function validate_zip_file(string $file_path, bool $ignore_extension_check = fal
ZipArchive::ER_READ => "Read error.",
ZipArchive::ER_SEEK => "Seek error.",
];
// PHP 8.4 and later
if (defined('ZipArchive::ER_TRUNCATED_ZIP')) {
$zip_results[ZipArchive::ER_TRUNCATED_ZIP] = "Truncated archive.";
}
$error = $zip_results[$result] ?? "Error code $result";
throw new ZipException("ZipArchive::open() returned '$error'");
}
Expand Down