[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 f31c679: Fix support for Zip64 zip files
From: |
Eli Zaretskii |
Subject: |
emacs-27 f31c679: Fix support for Zip64 zip files |
Date: |
Fri, 25 Sep 2020 10:11:56 -0400 (EDT) |
branch: emacs-27
commit f31c6792ab98c8be343838f59d96e35c05353521
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Fix support for Zip64 zip files
* lisp/arc-mode.el (archive-zip-summarize): Fix detection of Zip64
central directory. Support 64-bit file size field used by Zip64.
(Bug#43597)
---
lisp/arc-mode.el | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index d6e85bf..c09f78e 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1799,10 +1799,10 @@ This doesn't recover lost files, it just undoes changes
in the buffer itself."
files
visual
emacs-int-has-32bits)
- (when (= p -1)
- ;; If the offset of end-of-central-directory is -1, this is a
- ;; Zip64 extended ZIP file format, and we need to glean the info
- ;; from Zip64 records instead.
+ (when (or (= p #xffffffff) (= p -1))
+ ;; If the offset of end-of-central-directory is 0xFFFFFFFF, this
+ ;; is a Zip64 extended ZIP file format, and we need to glean the
+ ;; info from Zip64 records instead.
;;
;; First, find the Zip64 end-of-central-directory locator.
(search-backward "PK\006\007")
@@ -1828,6 +1828,15 @@ This doesn't recover lost files, it just undoes changes
in the buffer itself."
(efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen))))
(decode-coding-string
str archive-file-name-coding-system)))
+ (ucsize (if (and (or (= ucsize #xffffffff) (= ucsize -1))
+ (> exlen 0))
+ ;; APPNOTE.TXT, para 4.5.3: the Extra Field
+ ;; begins with 2 bytes of signature
+ ;; (\000\001), followed by 2 bytes that give
+ ;; the size of the extra block, followed by
+ ;; an 8-byte uncompressed size.
+ (archive-l-e (+ p 46 fnlen 4) 8)
+ ucsize))
(isdir (and (= ucsize 0)
(string= (file-name-nondirectory efnname) "")))
(mode (cond ((memq creator '(2 3)) ; Unix
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 f31c679: Fix support for Zip64 zip files,
Eli Zaretskii <=