From: Kenichi Handa Date: Thu, 8 Dec 2011 05:54:20 +0000 (+0900) Subject: coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) after the loop to call... X-Git-Tag: emacs-pretest-24.0.93~209 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76470ad1a01b2d38137fe5fb9e2a18446e7d4536;p=emacs.git coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) after the loop to call ccl_driver at least once. --- diff --git a/src/ChangeLog b/src/ChangeLog index 71b1b3fa82c..056d0dbe666 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Kazuhiro Ito (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 * ftfont.c (get_adstyle_property): Fix previous change diff --git a/src/coding.c b/src/coding.c index 537f69ebe1f..50268099413 100644 --- a/src/coding.c +++ b/src/coding.c @@ -5244,7 +5244,7 @@ encode_coding_ccl (struct coding_system *coding) && 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 @@ encode_coding_ccl (struct coding_system *coding) || ccl->status == CCL_STAT_INVALID_CMD) break; } + while (charbuf < charbuf_end); switch (ccl->status) {