emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100661: coding.c (produce_chars):


From: Kenichi Handa
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100661: coding.c (produce_chars): Fix updating of src_end (Bug#10701).
Date: Wed, 08 Feb 2012 17:32:25 +0900
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 100661 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Wed 2012-02-08 17:32:25 +0900
message:
  coding.c (produce_chars): Fix updating of src_end (Bug#10701).
modified:
  src/ChangeLog
  src/coding.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-25 05:35:05 +0000
+++ b/src/ChangeLog     2012-02-08 08:31:05 +0000
@@ -1,3 +1,7 @@
+2012-02-08  Kenichi Handa  <address@hidden>
+
+       * coding.c (produce_chars): Fix updating of src_end (Bug#10701).
+
 2012-01-25  Chong Yidong  <address@hidden>
 
        * Version 23.4 released.

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-01-25 05:35:05 +0000
+++ b/src/coding.c      2012-02-08 08:31:05 +0000
@@ -7038,7 +7038,7 @@
                          dst_end = coding->destination + coding->dst_bytes;
                          coding_set_source (coding);
                          src = coding->source + offset;
-                         src_end = coding->source + coding->src_bytes;
+                         src_end = coding->source + coding->consumed;
                          if (EQ (coding->src_object, coding->dst_object))
                            dst_end = (unsigned char *) src;
                        }
@@ -7072,7 +7072,7 @@
                        dst_end = coding->destination + coding->dst_bytes;
                        coding_set_source (coding);
                        src = coding->source + offset;
-                       src_end = coding->source + coding->src_bytes;
+                       src_end = coding->source + coding->consumed;
                        if (EQ (coding->src_object, coding->dst_object))
                          dst_end = (unsigned char *) src;
                      }
@@ -7093,7 +7093,7 @@
                  dst = alloc_destination (coding, require, dst);
                  coding_set_source (coding);
                  src = coding->source + offset;
-                 src_end = coding->source + coding->src_bytes;
+                 src_end = coding->source + coding->consumed;
                }
            }
          produced_chars = coding->consumed_char;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]