Skip to content

Distribute and run LLMs with a single file.

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

Jeremy Schoemaker5ac1c4dbb767
diff --git a/llamafile/zip.c b/llamafile/zip.c
index ba623745..18470067 100644
--- a/llamafile/zip.c
+++ b/llamafile/zip.c
@@ -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));
@@ -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)
@@ -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)