(decode_composition_emacs_mule): Fix handling of

incorrect format data.

diff --git a/src/ChangeLog b/src/ChangeLog
index d170c6cd168fa5272f77994438184c94a4aca771..056bb851f4a87889b9e418572c8ae92cae684552 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Kenichi Handa  <handa@m17n.org>
+
+       * coding.c (decode_composition_emacs_mule): Fix handling of
+       incorrect format data.
+
 2006-01-31  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (update_frame_tool_bar): Use new tool bar functions

diff --git a/src/coding.c b/src/coding.c
index 5985e895ef6e85e238314f6316618336abf4399d..385481d1a635841f635fdcf43e3e3983139bf1dc 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -872,7 +872,7 @@ decode_composition_emacs_mule (coding, src, src_end,
          component[ncomponent] = c;
        }
     }
-  else
+  else if (c >= 0x80)
     {
       /* This may be an old Emacs 20 style format.  See the comment at
         the section 2 of this file.  */
@@ -924,6 +924,8 @@ decode_composition_emacs_mule (coding, src, src_end,
       else
        return 0;
     }
+  else
+    return 0;
 
   if (buf == bufp || dst + (bufp - buf) <= (dst_bytes ? dst_end : src))
     {