Commit 95402d5f authored by Kenichi Handa's avatar Kenichi Handa

coding.c (decode_coding_ccl, encode_coding_ccl): Pay attention to the buffer...

coding.c (decode_coding_ccl, encode_coding_ccl): Pay attention to the buffer relocation which may be caused by ccl_driver.
parent 51c4474e
2012-09-30 Kenichi Handa <handa@gnu.org>
* coding.c (decode_coding_ccl, encode_coding_ccl): Pay attention
to the buffer relocation which may be caused by ccl_driver.
2012-09-22 Paul Eggert <eggert@cs.ucla.edu>
* .gdbinit: Just stop at fatal_error_backtrace.
......
......@@ -5106,6 +5106,7 @@ decode_coding_ccl (struct coding_system *coding)
while (1)
{
const unsigned char *p = src;
ptrdiff_t offset;
int i = 0;
if (multibytep)
......@@ -5123,8 +5124,17 @@ decode_coding_ccl (struct coding_system *coding)
if (p == src_end && coding->mode & CODING_MODE_LAST_BLOCK)
ccl->last_block = 1;
/* As ccl_driver calls DECODE_CHAR, buffer may be relocated. */
charset_map_loaded = 0;
ccl_driver (ccl, source_charbuf, charbuf, i, charbuf_end - charbuf,
charset_list);
if (charset_map_loaded
&& (offset = coding_change_source (coding)))
{
p += offset;
src += offset;
src_end += offset;
}
charbuf += ccl->produced;
if (multibytep)
src += source_byteidx[ccl->consumed];
......@@ -5177,8 +5187,15 @@ encode_coding_ccl (struct coding_system *coding)
do
{
ptrdiff_t offset;
/* As ccl_driver calls DECODE_CHAR, buffer may be relocated. */
charset_map_loaded = 0;
ccl_driver (ccl, charbuf, destination_charbuf,
charbuf_end - charbuf, 1024, charset_list);
if (charset_map_loaded
&& (offset = coding_change_destination (coding)))
dst += offset;
if (multibytep)
{
ASSURE_DESTINATION (ccl->produced * 2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment