mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Fix 'uudecode-decode-region-internal' in multibyte buffers

Browse Source 
* lisp/mail/uudecode.el (uudecode-decode-region-internal): Fix
inserting the decoded string into a multibyte buffer.  Optimize by
working with characters, not strings.  (Bug#44411)

Copyright-paperwork-exempt: yes
This commit is contained in:
Kazuhiro Ito 2020-11-05 19:48:08 +09:00 committed by Eli Zaretskii
parent d4242177da
commit f5d7fb3a2d
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lisp/mail/uudecode.el
View File

@ -162,12 +162,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
(setq counter (1+ counter)
inputpos (1+ inputpos))
(cond ((= counter 4)
(setq result (cons
(concat
(char-to-string (ash bits -16))
(char-to-string (logand (ash bits -8) 255))
(char-to-string (logand bits 255)))
result))
(setq result (cons (logand bits 255)
(cons (logand (ash bits -8) 255)
(cons (ash bits -16)
result))))
(setq bits 0 counter 0))
(t (setq bits (ash bits 6)))))))
(cond
@ -179,26 +177,26 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
;;(error "uucode ends unexpectedly")
(setq done t))
((= counter 3)
(setq result (cons
(concat
(char-to-string (logand (ash bits -16) 255))
(char-to-string (logand (ash bits -8) 255)))
result)))
(setq result (cons (logand (ash bits -8) 255)
(cons (logand (ash bits -16) 255)
result))))
((= counter 2)
(setq result (cons
(char-to-string (logand (ash bits -10) 255))
result))))
(setq result (cons (logand (ash bits -10) 255)
result))))
(skip-chars-forward non-data-chars end))
(if file-name
(with-temp-file file-name
(set-buffer-multibyte nil)
(insert (apply #'concat (nreverse result))))
(apply #'insert (nreverse result)))
(or (markerp end) (setq end (set-marker (make-marker) end)))
(goto-char start)
(if enable-multibyte-characters
(dolist (x (nreverse result))
(insert (decode-coding-string x 'binary)))
(insert (apply #'concat (nreverse result))))
(apply #'insert
(nreverse
(if enable-multibyte-characters
(mapcar (lambda (ch)
(or (decode-char 'eight-bit ch) ch))
result)
result)))
(delete-region (point) end))))))
;;;###autoload