Fix unzip warning with apelink generated symtabs

jart · Nov 19, 2023 · 0c89516 · 0c89516
1 parent 3e6d536
commit 0c89516
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 59 deletions.
diff --git a/libc/str/getzipcfilecompressedsize.c b/libc/str/getzipcfilecompressedsize.c
@@ -27,7 +27,7 @@ int64_t GetZipCfileCompressedSize(const uint8_t *z) {
   }
   const uint8_t *p = ZIP_CFILE_EXTRA(z);
   const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
-  for (; p < pe; p += ZIP_EXTRA_SIZE(p)) {
+  for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) {
     if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
       if (8 <= ZIP_EXTRA_CONTENTSIZE(p)) {
         return READ64LE(ZIP_EXTRA_CONTENT(p));

diff --git a/libc/str/getzipcfileoffset.c b/libc/str/getzipcfileoffset.c
@@ -27,7 +27,7 @@ int64_t GetZipCfileOffset(const uint8_t *z) {
   }
   const uint8_t *p = ZIP_CFILE_EXTRA(z);
   const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
-  for (; p < pe; p += ZIP_EXTRA_SIZE(p)) {
+  for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) {
     if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
       int offset = 0;
       if (ZIP_CFILE_COMPRESSEDSIZE(z) == 0xFFFFFFFFu) {

diff --git a/libc/str/getzipcfileuncompressedsize.c b/libc/str/getzipcfileuncompressedsize.c
@@ -27,7 +27,7 @@ int64_t GetZipCfileUncompressedSize(const uint8_t *z) {
   }
   const uint8_t *p = ZIP_CFILE_EXTRA(z);
   const uint8_t *pe = p + ZIP_CFILE_EXTRASIZE(z);
-  for (; p < pe; p += ZIP_EXTRA_SIZE(p)) {
+  for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) {
     if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
       int offset = 0;
       if (ZIP_CFILE_COMPRESSEDSIZE(z) == 0xFFFFFFFFu) {

diff --git a/libc/str/getziplfilecompressedsize.c b/libc/str/getziplfilecompressedsize.c
@@ -27,7 +27,7 @@ int64_t GetZipLfileCompressedSize(const uint8_t *z) {
   }
   const uint8_t *p = ZIP_LFILE_EXTRA(z);
   const uint8_t *pe = p + ZIP_LFILE_EXTRASIZE(z);
-  for (; p < pe; p += ZIP_EXTRA_SIZE(p)) {
+  for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) {
     if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
       if (8 <= ZIP_EXTRA_CONTENTSIZE(p)) {
         return READ64LE(ZIP_EXTRA_CONTENT(p));

diff --git a/libc/str/getziplfileuncompressedsize.c b/libc/str/getziplfileuncompressedsize.c
@@ -27,7 +27,7 @@ int64_t GetZipLfileUncompressedSize(const uint8_t *z) {
   }
   const uint8_t *p = ZIP_LFILE_EXTRA(z);
   const uint8_t *pe = p + ZIP_LFILE_EXTRASIZE(z);
-  for (; p < pe; p += ZIP_EXTRA_SIZE(p)) {
+  for (; p + ZIP_EXTRA_SIZE(p) <= pe; p += ZIP_EXTRA_SIZE(p)) {
     if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64) {
       int offset = 0;
       if (ZIP_LFILE_COMPRESSEDSIZE(z) == 0xFFFFFFFFu) {

diff --git a/libc/zip.internal.h b/libc/zip.internal.h
@@ -89,6 +89,8 @@
 
 #define kZipCfileHdrMagic                 ZM_(0x02014b50) /* PK☺☻ "PK\1\2" */
 #define kZipCfileHdrMinSize               46
+#define kZipCfileOffsetVersionMadeBy      4
+#define kZipCfileOffsetVersionNeeded      6
 #define kZipCfileOffsetGeneralflag        8
 #define kZipCfileOffsetCompressionmethod  10
 #define kZipCfileOffsetLastmodifiedtime   12

diff --git a/tool/build/apelink.c b/tool/build/apelink.c
@@ -674,9 +674,10 @@ static void LoadSymbols(Elf64_Ehdr *e, Elf64_Off size, const char *path) {
   unsigned char *cfile = Malloc(cfile_size);
   bzero(cfile, cfile_size);
   WRITE32LE(cfile, kZipCfileHdrMagic);
-  cfile[4] = kZipCosmopolitanVersion;
-  cfile[5] = kZipOsUnix;
-  cfile[6] = kZipEra2001;
+  WRITE16LE(cfile + kZipCfileOffsetVersionMadeBy,
+            kZipOsUnix << 8 | kZipCosmopolitanVersion);
+  WRITE16LE(cfile + kZipCfileOffsetVersionNeeded, kZipEra2001);
+  WRITE16LE(cfile + kZipCfileOffsetGeneralflag, kZipGflagUtf8);
   WRITE16LE(cfile + kZipCfileOffsetCompressionmethod, kZipCompressionDeflate);
   WRITE16LE(cfile + kZipCfileOffsetLastmodifieddate, DOS_DATE(2023, 7, 29));
   WRITE16LE(cfile + kZipCfileOffsetLastmodifiedtime, DOS_TIME(0, 0, 0));
@@ -1813,9 +1814,11 @@ int main(int argc, char *argv[]) {
   int i, j;
   Elf64_Off offset;
   Elf64_Xword prologue_bytes;
-#ifndef NDEBUG
+
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
+
   prog = argv[0];
   if (!prog) prog = "apelink";
 
@@ -2080,7 +2083,8 @@ int main(int argc, char *argv[]) {
           p = stpcpy(p, " count=");
           loader->ddarg_size1 = p;
           p = GenerateDecimalOffsetRelocation(p);
-          p = stpcpy(p, " bs=1 2>/dev/null | gzip -dc >\"$t.$$\" ||exit\n");
+          p = stpcpy(
+              p, " bs=1 2>/dev/null | /usr/bin/gzip -dc >\"$t.$$\" ||exit\n");
           if (loader->macho_offset) {
             p = stpcpy(p, "/bin/dd if=\"$t.$$\" of=\"$t.$$\"");
             p = stpcpy(p, " skip=");

diff --git a/tool/build/ar.c b/tool/build/ar.c
@@ -294,7 +294,7 @@ int main(int argc, char *argv[]) {
   struct ar_hdr header1;
   struct ar_hdr header2;
 
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
 

diff --git a/tool/build/compile.c b/tool/build/compile.c
@@ -837,7 +837,7 @@ int main(int argc, char *argv[]) {
   char *s, *q, **envp;
   int ws, opt, exitcode;
 
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
 

diff --git a/tool/build/elf2pe.c b/tool/build/elf2pe.c
@@ -1078,7 +1078,7 @@ static void Pwrite(int fd, const void *data, size_t size, uint64_t offset) {
 }
 
 int main(int argc, char *argv[]) {
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
   // get program name

diff --git a/tool/build/mkdeps.c b/tool/build/mkdeps.c
@@ -124,6 +124,8 @@ static const uint32_t kSourceExts[] = {
     EXT("c"),    // c
     EXT("cc"),   // c++
     EXT("cpp"),  // c++
+    EXT("cu"),   // cuda
+    EXT("m"),    // objective c
 };
 
 static char *names;
@@ -667,7 +669,7 @@ int main(int argc, char *argv[]) {
   ssize_t rc;
   size_t i, n;
   char *makefile;
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
   prog = argv[0];

diff --git a/tool/build/objbincopy.c b/tool/build/objbincopy.c
@@ -71,7 +71,7 @@
   "  INPUT      is an elf executable made by the unix linker\n"  \
   "\n"
 
-#ifndef NDEBUG
+#ifdef MODE_DBG
 #define DEBUG(...) kprintf("DEBUG: " __VA_ARGS__)
 #else
 #define DEBUG(...) (void)0

diff --git a/tool/build/package.c b/tool/build/package.c
@@ -114,7 +114,7 @@ struct Packages {
         Elf64_Xword symcount;    // not persisted
         int section_offset;
         int section_count;
-      } * p;
+      } *p;
     } objects;
     struct Sections {
       size_t i, n;
@@ -128,7 +128,7 @@ struct Packages {
           kBss,
           kOther,
         } kind;
-      } * p;
+      } *p;
     } sections;
     struct Symbols {
       size_t i, n;
@@ -139,9 +139,9 @@ struct Packages {
         uint8_t type : 4;
         uint16_t object;   // pkg->objects.p[object]
         uint16_t section;  // pkg->sections.p[section]
-      } * p;               // persisted as pkg+RVA
+      } *p;                // persisted as pkg+RVA
     } symbols, undefs;     // TODO(jart): hash undefs?
-  } * *p;                  // persisted across multiple files
+  } **p;                   // persisted across multiple files
 };
 
 struct Relas {
@@ -150,7 +150,7 @@ struct Relas {
   struct Rela {
     const char *symbol_name;
     const char *object_path;
-  } * p;
+  } *p;
 } prtu;
 
 static wontreturn void Die(const char *path, const char *reason) {
@@ -649,7 +649,7 @@ int main(int argc, char *argv[]) {
   if (argc == 2 && !strcmp(argv[1], "-n")) {
     exit(0);
   }
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
   bzero(&pkg, sizeof(pkg));

diff --git a/tool/build/pecheck.c b/tool/build/pecheck.c
@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) {
   void *map;
   ssize_t size;
   const char *path;
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
   for (i = 1; i < argc; ++i) {

diff --git a/tool/build/runitd.c b/tool/build/runitd.c
@@ -809,7 +809,7 @@ int main(int argc, char *argv[]) {
   if (g_daemonize) Daemonize();
   Serve();
   free(g_psk);
-#if IsModeDbg()
+#ifdef MODE_DBG
   CheckForMemoryLeaks();
   CheckForFileLeaks();
 #endif

diff --git a/tool/build/zipcopy.c b/tool/build/zipcopy.c
@@ -211,7 +211,7 @@ static void CopyZip(void) {
 }
 
 int main(int argc, char *argv[]) {
-#ifndef NDEBUG
+#ifdef MODE_DBG
   ShowCrashReports();
 #endif
   prog = argv[0];