[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file
From: |
Eli Zaretskii |
Subject: |
bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file |
Date: |
Fri, 25 Sep 2020 16:33:21 +0300 |
> Date: Fri, 25 Sep 2020 15:43:48 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 43597@debbugs.gnu.org
>
> > Date: Fri, 25 Sep 2020 15:38:56 +0300
> > From: Eli Zaretskii <eliz@gnu.org>
> > Cc: 43597@debbugs.gnu.org
> >
> > Thanks, with this file I do see the problem.
>
> Oops, I spoke too soon, using the wrong version of Emacs to test this.
>
> The change -1 => #xffffffff fixes the problem with this file as well.
> So I guess the remaining issues rear their ugly heads in a 64-bit
> Emacs, and I need to debug there...
Wrong again, sigh... This has nothing to do with 64-bit builds.
Anyway, here's the proposed patch, please test:
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 @@ archive-zip-summarize
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 @@ archive-zip-summarize
(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
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, (continued)
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Stephen Berman, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Stephen Berman, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Stephen Berman, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Stephen Berman, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file,
Eli Zaretskii <=
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Stephen Berman, 2020/09/25
- bug#43597: 28.0.50; arc-mode.el fails to display a ZIP file, Eli Zaretskii, 2020/09/25