From: Kenichi Handa <handa@m17n.org>
Date: Mon, 2 Feb 2004 12:09:36 +0000 (+0000)
Subject: (coding_restore_composition): Check invalid
X-Git-Tag: ttn-vms-21-2-B4~7775
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09721b316cebc6dca2a6148f38de6c96b31cdea6;p=emacs.git

(coding_restore_composition): Check invalid
composition data more rigidly.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 98584a9b324..9a93ac894ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-02  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (coding_restore_composition): Check invalid
+	composition data more rigidly.
+
 2004-01-30  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* fileio.c (Fread_file_name_internal): Correctly handle the case
diff --git a/src/coding.c b/src/coding.c
index d9620b90722..7880e439e9d 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5458,6 +5458,9 @@ coding_restore_composition (coding, obj)
 	      if (method == COMPOSITION_WITH_RULE_ALTCHARS
 		  && len % 2 == 0)
 		len --;
+	      if (len < 1)
+		/* Invalid composition data.  */
+		break;
 	      for (j = 0; j < len; j++)
 		args[j] = make_number (data[4 + j]);
 	      components = (method == COMPOSITION_WITH_ALTCHARS