From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Feb 2006 12:47:04 +0000 (+0000)
Subject: (decode_composition_emacs_mule): Fix handling of
X-Git-Tag: emacs-pretest-22.0.90~4413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=999a0fe581bf2788cd438d03f7f33d4a1d0f0646;p=emacs.git

(decode_composition_emacs_mule): Fix handling of
incorrect format data.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d170c6cd168..056bb851f4a 100644
--- 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,Ad(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 5985e895ef6..385481d1a63 100644
--- 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))
     {