RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:07:44 +00:00
Code Issues Activity Actions

LibArchive: Use named members for ZIP general purpose flags

Browse source 
This fixes the faulty bit check that misclassified ZIPs as having
data descriptors.
This commit is contained in:
Tim Schumacher 2022-05-12 21:54:08 +02:00 • committed by Linus Groh
parent 1f94c8c622
commit acc9be9f7d
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibArchive/Zip.cpp
View file

@ -51,9 +51,9 @@ Optional<Zip> Zip::try_create(ReadonlyBytes buffer)
return {};
if (!central_directory_record.read(buffer.slice(member_offset)))
return {};
if (central_directory_record.general_purpose_flags & 1)
if (central_directory_record.general_purpose_flags.encrypted)
return {}; // TODO: support encrypted zip members
if (central_directory_record.general_purpose_flags & 3)
if (central_directory_record.general_purpose_flags.data_descriptor)
return {}; // TODO: support zip data descriptors
if (central_directory_record.compression_method != ZipCompressionMethod::Store && central_directory_record.compression_method != ZipCompressionMethod::Deflate)
return {}; // TODO: support obsolete zip compression methods
@ -128,7 +128,7 @@ void ZipOutputStream::add_member(ZipMember const& member)
LocalFileHeader local_file_header {
.minimum_version = minimum_version_needed(member.compression_method),
.general_purpose_flags = 0,
.general_purpose_flags = { .flags = 0 },
.compression_method = static_cast<u16>(member.compression_method),
.modification_time = 0, // TODO: support modification time
.modification_date = 0,
@ -156,7 +156,7 @@ void ZipOutputStream::finish()
CentralDirectoryRecord central_directory_record {
.made_by_version = zip_version,
.minimum_version = zip_version,
.general_purpose_flags = 0,
.general_purpose_flags = { .flags = 0 },
.compression_method = member.compression_method,
.modification_time = 0, // TODO: support modification time
.modification_date = 0,