mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-26 04:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove old zip base skew hack

Browse source 
Since 8ff48201ca we no longer need the
hack where, when running .com.dbg files, we scanned for the embedded
.com file offset, and then computed zip offsets realtive to that. It
wasn't very reliable in the first place, and was causing issues with
running our new .com.dbg executables, which are true zip files.
This commit is contained in:
Justine Tunney 2023-06-17 04:20:16 -07:00
parent 207e18a060
commit 52d28966f7
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
10 changed files with 134 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libc/str/iszipeocd64.c
View file

@ -16,34 +16,41 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/stdckdint.h"
#include "libc/zip.internal.h"
/**
* Returns kZipOk if zip64 end of central directory header seems legit.
*/
int IsZipEocd64(const uint8_t *p, size_t n, size_t i) {
if (i + kZipCdir64HdrMinSize > n) {
size_t off, loc;
uint64_t cdsize;
if (i > n || i + kZipCdir64HdrMinSize > n) {
return kZipErrorEocdOffsetOverflow;
}
if (READ32LE(p + i) != kZipCdir64HdrMagic) {
return kZipErrorEocdMagicNotFound;
}
if (i + ZIP_CDIR64_HDRSIZE(p + i) + kZipCdir64LocatorSize > n) {
if (ckd_add(&loc, i, ZIP_CDIR64_HDRSIZE(p + i)) || //
ckd_add(&off, loc, kZipCdir64LocatorSize) || //
off > n) { //
return kZipErrorEocdSizeOverflow;
}
if (ZIP_LOCATE64_MAGIC(p + i + ZIP_CDIR64_HDRSIZE(p + i)) !=
kZipCdir64LocatorMagic) {
return kZipErrorCdirLocatorMagic;
if (ZIP_LOCATE64_MAGIC(p + loc) != kZipCdir64LocatorMagic) {
return kZipErrorEocdLocatorMagic;
}
if (ZIP_LOCATE64_OFFSET(p + i + ZIP_CDIR64_HDRSIZE(p + i)) != i) {
return kZipErrorCdirLocatorOffset;
if (ZIP_LOCATE64_OFFSET(p + loc) != i) {
return kZipErrorEocdLocatorOffset;
}
if (ZIP_CDIR64_RECORDS(p + i) * kZipCfileHdrMinSize >
ZIP_CDIR64_SIZE(p + i)) {
return kZipErrorCdirRecordsOverflow;
if (ckd_add(&off, ZIP_CDIR64_OFFSET(p + i), ZIP_CDIR64_SIZE(p + i))) {
return kZipErrorEocdOffsetSizeOverflow;
}
if (ZIP_CDIR64_OFFSET(p + i) + ZIP_CDIR64_SIZE(p + i) > i) {
if (off > i) {
return kZipErrorCdirOffsetPastEocd;
}
if (ckd_mul(&cdsize, ZIP_CDIR64_RECORDS(p + i), kZipCfileHdrMinSize) ||
cdsize > ZIP_CDIR64_SIZE(p + i)) {
return kZipErrorEocdRecordsOverflow;
}
return kZipOk;
}