Changeset d091007 in mainline for boot/generic/src/payload.c

Timestamp:

2021-06-04T16:58:15Z (3 years ago)

Author:

Martin Decky <martin@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3c8c580

Parents:

da15002

Message:

Detect a compressed component by GZIP signature, not file extension

File:

• boot/generic/src/payload.c (modified) (3 diffs)

boot/generic/src/payload.c

@@ -61 +61 @@
 {
         char *e = (char *) ext(s);
-        if (e != NULL && str_cmp(e, ".gz") == 0)
+        if ((e != NULL) && (str_cmp(e, ".gz") == 0))
                 *e = '\0';
-}
-
-static bool isgzip(const char *s)
-{
-        const char *e = ext(s);
-        return e != NULL && str_cmp(e, ".gz") == 0;
 }
 
@@ -82 +76 @@
 {
         const char *name;
-        const uint8_t *data;
         size_t packed_size;
-        size_t unpacked_size;
 
         if (!tar_info(*cstart, cend, &name, &packed_size))
                 return false;
 
-        data = *cstart + TAR_BLOCK_SIZE;
+        const uint8_t *data = *cstart + TAR_BLOCK_SIZE;
         *cstart += TAR_BLOCK_SIZE + ALIGN_UP(packed_size, TAR_BLOCK_SIZE);
 
-        bool gz = isgzip(name);
-
-        unpacked_size = gz ? gzip_size(data, packed_size) : packed_size;
+        bool gz = gzip_check(data, packed_size);
+        size_t unpacked_size = gz ? gzip_size(data, packed_size) : packed_size;
 
         /* Components must be page-aligned. */
@@ -156 +147 @@
         while (tar_info(start, payload_end, &name, &packed_size)) {
                 sz = ALIGN_UP(sz, PAGE_SIZE);
-                if (isgzip(name))
+                if (gzip_check(start + TAR_BLOCK_SIZE, packed_size))
                         sz += gzip_size(start + TAR_BLOCK_SIZE, packed_size);
                 else