(decode_coding_emacs_mule): Handle insufficent source correctly.

1 files changed, 19 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index 62c761c5bcf..76ef3026a2d 100644
--- 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))
         {