[Emacs-diffs] emacs/src coding.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/01/07 06:49:38

Modified files:
        src            : coding.c 

Log message:
        (decode_coding_utf_8): Check byte_after_cr before breaking the loop.
        (decode_coding_utf_16, decode_coding_emacs_mule)
        (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
        (decode_coding_charset): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.403&r2=1.404

Patches:
Index: coding.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/coding.c,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -b -r1.403 -r1.404
--- coding.c    20 Dec 2008 07:59:33 -0000      1.403
+++ coding.c    7 Jan 2009 06:49:37 -0000       1.404
@@ -1376,7 +1376,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        c1 = byte_after_cr, byte_after_cr = -1;
@@ -1682,7 +1686,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf + 2 >= charbuf_end)
+       {
+         if (byte_after_cr1 >= 0)
+           src_base -= 2;
        break;
+       }
 
       if (byte_after_cr1 >= 0)
        c1 = byte_after_cr1, byte_after_cr1 = -1;
@@ -2286,7 +2294,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        c = byte_after_cr, byte_after_cr = -1;
@@ -3197,7 +3209,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        c1 = byte_after_cr, byte_after_cr = -1;
@@ -4371,7 +4387,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        c = byte_after_cr, byte_after_cr = -1;
@@ -4479,7 +4499,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        c = byte_after_cr, byte_after_cr = -1;
@@ -5144,7 +5168,11 @@
       consumed_chars_base = consumed_chars;
 
       if (charbuf >= charbuf_end)
+       {
+         if (byte_after_cr >= 0)
+           src_base--;
        break;
+       }
 
       if (byte_after_cr >= 0)
        {