[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#11282: 24.1.50; Error in decoding message
From: |
Kenichi Handa |
Subject: |
bug#11282: 24.1.50; Error in decoding message |
Date: |
Fri, 04 May 2012 15:33:55 +0900 |
In article <E1SKwG9-0004v7-NR@fencepost.gnu.org>, Richard Stallman
<rms@gnu.org> writes:
> When I visit this as an Rmail file, Rmail gets an error
> decoding the coding system. Maybe the message really is
> invalid, but Rmail should not get an unhandled Lisp error.
> Here is the backtrace.
> Debugger entered--Lisp error: (wrong-type-argument wholenump nil)
> decode-coding-region(888 1351 utf-7)
> rmail-mime-insert-decoded-text([("text/html" (charset . "utf-7"))
> ("inline") "7bit" [[nil nil nil] [t nil t]] [#<marker at 1 in bad-message>
> #<marker at 5343 in bad-message> t] ["" (nil) nil] [#<marker at 5343 in
> bad-message> #<marker at 5806 in bad-message> t] nil rmail-mime-insert-text
> nil])
[...]
I've just installed this change to the trunk. I think it
should also be applied to 24.1.
2012-05-03 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-show-mime): Catch an error caused by text
decoding, and show a warning message without signalling an error
(Bug#11282).
=== modified file 'lisp/mail/rmailmm.el'
--- lisp/mail/rmailmm.el 2012-01-19 07:21:25 +0000
+++ lisp/mail/rmailmm.el 2012-05-03 05:47:24 +0000
@@ -1300,26 +1300,40 @@
(rmail-mime-mbox-buffer rmail-buffer)
(rmail-mime-view-buffer rmail-view-buffer)
(rmail-mime-coding-system nil))
+ ;; If ENTITY is not a vector, it is a string describing an error.
(if (vectorp entity)
(with-current-buffer rmail-mime-view-buffer
(erase-buffer)
- (rmail-mime-insert entity)
- (if (consp rmail-mime-coding-system)
- ;; Decoding is done by rfc2047-decode-region only for a
- ;; header. But, as the used coding system may have been
- ;; overridden by mm-charset-override-alist, we can't
- ;; trust (car rmail-mime-coding-system). So, here we
- ;; try the decoding again with mm-charset-override-alist
- ;; bound to nil.
- (let ((mm-charset-override-alist nil))
- (setq rmail-mime-coding-system
- (rmail-mime-find-header-encoding
- (rmail-mime-entity-header entity)))))
- (set-buffer-file-coding-system
- (if rmail-mime-coding-system
- (coding-system-base rmail-mime-coding-system)
- 'undecided)
- t t))
+ ;; This condition-case is for catching an error in the
+ ;; internal MIME decoding (e.g. incorrect BASE64 form) that
+ ;; may be signaled by rmail-mime-insert.
+ ;; FIXME: The current code doesn't set a proper error symbol
+ ;; in ERR. We must find a way to propagate a correct error
+ ;; symbol that is caused in the very deep code of text
+ ;; decoding (e.g. an error by base64-decode-region called by
+ ;; post-read-conversion function of utf-7).
+ (condition-case err
+ (progn
+ (rmail-mime-insert entity)
+ (if (consp rmail-mime-coding-system)
+ ;; Decoding is done by rfc2047-decode-region only for a
+ ;; header. But, as the used coding system may have been
+ ;; overridden by mm-charset-override-alist, we can't
+ ;; trust (car rmail-mime-coding-system). So, here we
+ ;; try the decoding again with mm-charset-override-alist
+ ;; bound to nil.
+ (let ((mm-charset-override-alist nil))
+ (setq rmail-mime-coding-system
+ (rmail-mime-find-header-encoding
+ (rmail-mime-entity-header entity)))))
+ (set-buffer-file-coding-system
+ (if rmail-mime-coding-system
+ (coding-system-base rmail-mime-coding-system)
+ 'undecided)
+ t t))
+ (error (setq entity (format "%s" err))))))
+ ;; Re-check ENTITY. It may be set to an error string.
+ (when (stringp entity)
;; Decoding failed. ENTITY is an error message. Insert the
;; original message body as is, and show warning.
(let ((region (with-current-buffer rmail-mime-mbox-buffer
- bug#11282: 24.1.50; Error in decoding message,
Kenichi Handa <=