lha: Fix integer truncation on 32 bit systems (#2161)

[thirdparty/libarchive.git] / libarchive / archive_read_support_format_lha.c

diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
index ae5a1d7d668e0e9558c1a121c5ca52a0318515cc..e417baad10a6ba9f5e46d9ed1a53a4c14ac49637 100644 (file)
--- a/libarchive/archive_read_support_format_lha.c
+++ b/libarchive/archive_read_support_format_lha.c
@@ -227,7 +227,7 @@ static int  lha_read_file_header_1(struct archive_read *, struct lha *);
 static int     lha_read_file_header_2(struct archive_read *, struct lha *);
 static int     lha_read_file_header_3(struct archive_read *, struct lha *);
 static int     lha_read_file_extended_header(struct archive_read *,
-                   struct lha *, uint16_t *, int, size_t, size_t *);
+                   struct lha *, uint16_t *, int, uint64_t, size_t *);
 static size_t  lha_check_header_format(const void *);
 static int     lha_skip_sfx(struct archive_read *);
 static time_t  lha_dos_time(const unsigned char *);
@@ -945,7 +945,7 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
 
        /* Read extended headers */
        err2 = lha_read_file_extended_header(a, lha, NULL, 2,
-           (size_t)(lha->compsize + 2), &extdsize);
+           (uint64_t)(lha->compsize + 2), &extdsize);
        if (err2 < ARCHIVE_WARN)
                return (err2);
        if (err2 < err)
@@ -1138,7 +1138,7 @@ invalid:
  */
 static int
 lha_read_file_extended_header(struct archive_read *a, struct lha *lha,
-    uint16_t *crc, int sizefield_length, size_t limitsize, size_t *total_size)
+    uint16_t *crc, int sizefield_length, uint64_t limitsize, size_t *total_size)
 {
        const void *h;
        const unsigned char *extdheader;
@@ -1187,8 +1187,7 @@ lha_read_file_extended_header(struct archive_read *a, struct lha *lha,
                }
 
                /* Sanity check to the extended header size. */
-               if (((uint64_t)*total_size + extdsize) >
-                                   (uint64_t)limitsize ||
+               if (((uint64_t)*total_size + extdsize) > limitsize ||
                    extdsize <= (size_t)sizefield_length)
                        goto invalid;