From: Russell Mullens <the_pimaster@hotmail.com>
Date: Wed, 24 Mar 2021 03:02:45 +0000 (+1100)
Subject: Fix declaration of variables, mostly to trigger a new check for what
X-Git-Tag: v3.5.2~25^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1514%2Fhead;p=thirdparty%2Flibarchive.git

Fix declaration of variables, mostly to trigger a new check for what
seems like an unrelated issue.
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 26291237c..5e8895af0 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -3416,9 +3416,12 @@ archive_read_support_format_zip_capabilities_seekable(struct archive_read * a)
 static int
 read_eocd(struct zip *zip, const char *p, int64_t current_offset)
 {
-	uint16_t disk_num = archive_le16dec(p + 4);
-	uint32_t cd_size = archive_le32dec(p + 12);
-	uint32_t cd_offset = archive_le32dec(p + 16);
+	uint16_t disk_num;
+	uint32_t cd_size, cd_offset;
+	
+	disk_num = archive_le16dec(p + 4);
+	cd_size = archive_le32dec(p + 12);
+	cd_offset = archive_le32dec(p + 16);
 
 	/* Sanity-check the EOCD we've found. */