From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 10 Jan 2015 18:03:41 +0000 (-0800)
Subject: Pass the correct pointer when checking the Zip64 end-of-central-directory
X-Git-Tag: v3.1.900a~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=610567e0b99d6e669485da1d40e432a172ed6709;p=thirdparty%2Flibarchive.git

Pass the correct pointer when checking the Zip64 end-of-central-directory
locator.

This fixes a bug introduced in 94bab9f when I reworked the
EOCD scan.
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 13f174819..e73c174fc 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -2372,7 +2372,7 @@ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
 					 * regular EOCD if present. */
 					if (i >= 20
 					    && memcmp(p + i - 20, "PK\006\007", 4) == 0) {
-						read_zip64_eocd(a, zip, p + i);
+						read_zip64_eocd(a, zip, p + i - 20);
 					}
 					return (ret);
 				}