diff options
| author | Kazuhiro Ito <kzhr@d1.dion.ne.jp> | 2020-11-05 19:48:08 +0900 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-11-07 11:40:52 +0200 |
| commit | f5d7fb3a2dee3f9ae49151e3d01483aad7fb734b (patch) | |
| tree | 879080be4e9573f784ecbb8adadfb79693ad2b4c /lisp/mail/uudecode.el | |
| parent | d4242177daaee9078245570125c5a99e65f55163 (diff) | |
| download | emacs-f5d7fb3a2dee3f9ae49151e3d01483aad7fb734b.tar.gz emacs-f5d7fb3a2dee3f9ae49151e3d01483aad7fb734b.tar.bz2 emacs-f5d7fb3a2dee3f9ae49151e3d01483aad7fb734b.zip | |
Fix 'uudecode-decode-region-internal' in multibyte buffers
* 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
Diffstat (limited to 'lisp/mail/uudecode.el')
| -rw-r--r-- | lisp/mail/uudecode.el | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el index 9423275b2e5..8bcb3925a9b 100644 --- a/lisp/mail/uudecode.el +++ b/lisp/mail/uudecode.el @@ -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 |