# HG changeset patch # User Kenichi Handa # Date 1048116876 0 # Node ID b49563831bd2bdcf5bf57d8f4ee6e9cf77c58c65 # Parent b453fa770ef20b465a8c72a1b47e2723c533a901 (ccl-decode-mule-utf-8): Fix a bug of invalid 5 to 6 bytes sequence. diff -r b453fa770ef2 -r b49563831bd2 lisp/international/utf-8.el --- a/lisp/international/utf-8.el Wed Mar 19 22:25:11 2003 +0000 +++ b/lisp/international/utf-8.el Wed Mar 19 23:34:36 2003 +0000 @@ -479,19 +479,21 @@ (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)))