(decode_coding_emacs_mule): Handle insufficent source correctly.

6eced09c · Kenichi Handa · 4f918f60 · 6eced09c · 6eced09c
Commit 6eced09c authored Mar 09, 2004 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/coding.c src/coding.c +19 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2004-03-09  Kenichi Handa  <handa@etlken2>
+
+	* coding.c (decode_coding_emacs_mule): Handle insufficent source
+	correctly.
+
 2004-03-04  Richard M. Stallman  <rms@gnu.org>

 	* s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS): New definition.

--- a/src/coding.c
+++ b/src/coding.c
@@ -1024,9 +1024,26 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
 	}
      else
 	{
-	  bytes = CHAR_STRING (*src, tmp);
-	  p = tmp;
+	  int i, c;
+
+	  bytes = BYTES_BY_CHAR_HEAD (*src);
 	  src++;
+	  for (i = 1; i < bytes; i++)
+	    {
+	      ONE_MORE_BYTE (c);
+	      if (CHAR_HEAD_P (c))
+		break;
+	    }
+	  if (i < bytes)
+	    {
+	      bytes = CHAR_STRING (*src_base, tmp);
+	      p = tmp;
+	      src = src_base + 1;
+	    }
+	  else
+	    {
+	      p = src_base;
+	    }
 	}
      if (dst + bytes >= (dst_bytes ? dst_end : src))
 	{