summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/coding.c4
2 files changed, 8 insertions, 1 deletions
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))
{