Skip to content

fix(zip): guard extra-field header read before bounds are known #1044

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

Open
shoemoney wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(zip): guard extra-field header read before bounds are known #1044

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
6 changes: 3 additions & 3 deletions llamafile/zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int64_t get_zip_cfile_uncompressed_size(const uint8_t *z) {
return ZIP_CFILE_UNCOMPRESSEDSIZE(z);
const uint8_t *p = ZIP_CFILE_EXTRA(z);
const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
for (; p + kZipExtraHdrSize <= pe && p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64)
if (8 <= ZIP_EXTRA_CONTENTSIZE(p))
return ZIP_READ64(ZIP_EXTRA_CONTENT(p));
Expand All @@ -35,7 +35,7 @@ int64_t get_zip_cfile_compressed_size(const uint8_t *z) {
return ZIP_CFILE_COMPRESSEDSIZE(z);
const uint8_t *p = ZIP_CFILE_EXTRA(z);
const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
for (; p + kZipExtraHdrSize <= pe && p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
int offset = 0;
if (ZIP_CFILE_UNCOMPRESSEDSIZE(z) == 0xFFFFFFFFu)
Expand All @@ -51,7 +51,7 @@ int64_t get_zip_cfile_offset(const uint8_t *z) {
return ZIP_CFILE_OFFSET(z);
const uint8_t *p = ZIP_CFILE_EXTRA(z);
const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
for (; p + kZipExtraHdrSize <= pe && p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p))
if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
int offset = 0;
if (ZIP_CFILE_UNCOMPRESSEDSIZE(z) == 0xFFFFFFFFu)
Expand Down