(ccl-decode-mule-utf-8): Fix a bug of

invalid 5 to 6 bytes sequence.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47fbc67b565820fb037b280c4cbca77eca665863..e8be3fdcb807ca1e13b4dc23a08f8990d30ebffd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-20  Kenichi Handa  <handa@m17n.org>
+
+       * international/utf-8.el (ccl-decode-mule-utf-8): Fix a bug in
+       handling invalid 5 to 6 bytes sequence.
+
 2003-03-19  Simon Marshall  <simon@gnu.org>
 
        * progmodes/make-mode.el (makefile-font-lock-syntactic-keywords):

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 343b007b1e29ebd81d42dd95cd5d170a1ce1d13f..47247c7b507e62e668b47b938409e609fe795a3e 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -479,19 +479,21 @@ default.  Also, installing them may be rather slow."
                         (write-multibyte-character r5 r3))
                     (write-multibyte-character r6 r3))
                   (if (r0 >= #xf8)     ; 5- or 6-byte encoding
-                      ((read r1)
-                       (if (r1 < #xa0)
-                           (if (r1 < #x80) ; invalid byte
-                               (write r1)
-                             (write-multibyte-character r5 r1))
-                         (write-multibyte-character r6 r1))
+                      ((r0 = -1)
+                       (read r0)
+                       (if (r0 < #xa0)
+                           (if (r0 < #x80) ; invalid byte
+                               (write r0)
+                             (write-multibyte-character r5 r0))
+                         (write-multibyte-character r6 r0))
                        (if (r0 >= #xfc) ; 6-byte
-                           ((read r1)
-                            (if (r1 < #xa0)
-                                (if (r1 < #x80) ; invalid byte
-                                    (write r1)
-                                  (write-multibyte-character r5 r1))
-                              (write-multibyte-character r6 r1)))))))
+                           ((r0 = -1)
+                            (read r0)
+                            (if (r0 < #xa0)
+                                (if (r0 < #x80) ; invalid byte
+                                    (write r0)
+                                  (write-multibyte-character r5 r0))
+                              (write-multibyte-character r6 r0)))))))
                ;; else invalid byte >= #xfe
                (write-multibyte-character r6 r0))))))
       (repeat)))