[Emacs-diffs] /srv/bzr/emacs/trunk r106636: coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) after the loop to call ccl_driver at least once.

[Kenichi Handa]

------------------------------------------------------------
revno: 106636 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-08 14:57:00 +0900
message:
  coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) after the loop to 
call ccl_driver at least once.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-08 02:34:09 +0000
+++ b/src/ChangeLog     2011-12-08 05:54:20 +0000
@@ -1,3 +1,8 @@
+2011-12-08  Kazuhiro Ito  <address@hidden>  (tiny change)
+
+       * coding.c (encode_coding_ccl): Check (charbuf < charbuf_end)
+       after the loop to call ccl_driver at least once.
+
 2011-12-08  Kenichi Handa  <address@hidden>
 
        * ftfont.c (get_adstyle_property): Fix previous change

=== modified file 'src/coding.c'
--- a/src/coding.c      2011-12-05 09:05:10 +0000
+++ b/src/coding.c      2011-12-08 05:54:20 +0000
@@ -5244,7 +5244,7 @@
       && coding->mode & CODING_MODE_LAST_BLOCK)
     ccl->last_block = 1;
 
-  while (charbuf < charbuf_end)
+  do
     {
       ccl_driver (ccl, charbuf, destination_charbuf,
                  charbuf_end - charbuf, 1024, charset_list);
@@ -5266,6 +5266,7 @@
          || ccl->status == CCL_STAT_INVALID_CMD)
        break;
     }
+  while (charbuf < charbuf_end);
 
   switch (ccl->status)
     {