procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacs-lisp/package.el (package-untar-buffer): Handle problematic tarfile content listings.

Browse source 
Fixes: debbugs:13136
This commit is contained in:
Matt Fidler 2012-12-29 18:26:14 +08:00 • committed by Chong Yidong
parent d5b1b1aa9c
commit af39894ab4
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-29 Matt Fidler <matt.fidler@alcon.com> (tiny change)
* emacs-lisp/package.el (package-untar-buffer): Handle problematic
tarfile content listings (Bug#13136).
2012-12-29 Mark Lillibridge <mark.lillibridge@hp.com>
* mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert

6
lisp/emacs-lisp/package.el
View file

@ -604,7 +604,11 @@ untar into a directory named DIR; otherwise, signal an error."
(require 'tar-mode)
(tar-mode)
;; Make sure everything extracts into DIR.
(let ((regexp (concat "\\`" (regexp-quote dir) "/")))
(let ((regexp (concat "\\`" (regexp-quote dir)
;; Tarballs created by some utilities don't
;; list directories with a trailing slash
;; (Bug#13136).
"\\(/\\|\\'\\)")))
(dolist (tar-data tar-parse-info)
(unless (string-match regexp (aref tar-data 2))
(error "Package does not untar cleanly into directory %s/" dir))))