(decode_coding_emacs_mule): Handle insufficent source correctly.

diff --git a/src/ChangeLog b/src/ChangeLog
index bb8ef04bc672c525845f842ccdc017dc221fbf9f..95cec4f1f14d030884b77514b89fa22fbf6d4cf3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/src/coding.c b/src/coding.c
index 62c761c5bcf863af5dcf8c3cede426c10efbc1a7..76ef3026a2d1ee6357fc33a51050347a04b31476 100644 (file)
--- 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))
        {