StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store real number of records in regular end record when possible

Browse Source 
Only store uintmax for the number of entries in the regular end record
if it doesn't fit.  p7zip 16.02 rejects zip files where the number of
entries in the regular end record is larger than the number of entries
counted in the central directory.

Fixes: 187485108
Test: TestZip64P7ZipRecords
Change-Id: I0d116e228a0ee26e4e95bb3f35771da236a056eb
This commit is contained in:
Colin Cross
2021-05-07 15:59:32 -07:00
parent ee7e359131
commit 06eea2c9b8
2 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
third_party/zip/writer.go vendored
View File

@@ -155,7 +155,14 @@ func (w *Writer) Close() error {
// store max values in the regular end record to signal that
// that the zip64 values should be used instead
records = uint16max
// BEGIN ANDROID CHANGE: only store uintmax for the number of entries in the regular
// end record if it doesn't fit. p7zip 16.02 rejects zip files where the number of
// entries in the regular end record is larger than the number of entries counted
// in the central directory.
if records > uint16max {
records = uint16max
}
// END ANDROID CHANGE
size = uint32max
offset = uint32max
}