Commit 5eb05ea3 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

Pay attetion to the buffer relocation on encoding (Bug#9318).

parent 087ef505
2011-12-05 Kenichi Handa <handa@m17n.org>
* coding.c (encode_designation_at_bol): New args charbuf_end and
dst. Return the number of produced bytes. Callers changed.
2011-12-05 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change)
* coding.c (CODING_CHAR_CHARSET_P): New macro.
(encode_coding_emacs_mule, encode_coding_iso_2022): Use the above
macro (Bug#9318).
2011-12-05 Andreas Schwab <schwab@linux-m68k.org>
The following changes are to fix Bug#9318.
* coding.c (CODING_DECODE_CHAR): Adjusted for the new interface of
coding_set_source.
(CODING_ENCODE_CHAR, CODING_CHAR_CHARSET): New macros.
(coding_set_source): Return how many bytes coding->source was
relocated.
(coding_set_destination): Return how many bytes
coding->destination was relocated.
(encode_coding_emacs_mule, ENCODE_ISO_CHARACTER)
(encode_coding_iso_2022, encode_coding_sjis)
(encode_coding_big5, encode_coding_charset): Use macros
CODING_ENCODE_CHAR, CODING_CHAR_CHARSET.
2011-11-29 Jan Djärv <jan.h.d@swipnet.se> 2011-11-29 Jan Djärv <jan.h.d@swipnet.se>
* xterm.h (struct x_output): net_wm_state_hidden_seen is new. * xterm.h (struct x_output): net_wm_state_hidden_seen is new.
......
...@@ -847,16 +847,16 @@ static int encode_coding_ccl (struct coding_system *); ...@@ -847,16 +847,16 @@ static int encode_coding_ccl (struct coding_system *);
static void decode_coding_raw_text (struct coding_system *); static void decode_coding_raw_text (struct coding_system *);
static int encode_coding_raw_text (struct coding_system *); static int encode_coding_raw_text (struct coding_system *);
static void coding_set_source (struct coding_system *); static EMACS_INT coding_set_source (struct coding_system *);
static void coding_set_destination (struct coding_system *); static EMACS_INT coding_set_destination (struct coding_system *);
static void coding_alloc_by_realloc (struct coding_system *, EMACS_INT); static void coding_alloc_by_realloc (struct coding_system *, EMACS_INT);
static void coding_alloc_by_making_gap (struct coding_system *, static void coding_alloc_by_making_gap (struct coding_system *,
EMACS_INT, EMACS_INT); EMACS_INT, EMACS_INT);
static unsigned char *alloc_destination (struct coding_system *, static unsigned char *alloc_destination (struct coding_system *,
EMACS_INT, unsigned char *); EMACS_INT, unsigned char *);
static void setup_iso_safe_charsets (Lisp_Object); static void setup_iso_safe_charsets (Lisp_Object);
static unsigned char *encode_designation_at_bol (struct coding_system *, static int encode_designation_at_bol (struct coding_system *,
int *, unsigned char *); int *, int *, unsigned char *);
static int detect_eol (const unsigned char *, static int detect_eol (const unsigned char *,
EMACS_INT, enum coding_category); EMACS_INT, enum coding_category);
static Lisp_Object adjust_coding_eol_type (struct coding_system *, int); static Lisp_Object adjust_coding_eol_type (struct coding_system *, int);
...@@ -915,27 +915,68 @@ record_conversion_result (struct coding_system *coding, ...@@ -915,27 +915,68 @@ record_conversion_result (struct coding_system *coding,
} }
} }
/* This wrapper macro is used to preserve validity of pointers into /* These wrapper macros are used to preserve validity of pointers into
buffer text across calls to decode_char, which could cause buffer text across calls to decode_char, encode_char, etc, which
relocation of buffers if it loads a charset map, because loading a could cause relocation of buffers if it loads a charset map,
charset map allocates large structures. */ because loading a charset map allocates large structures. */
#define CODING_DECODE_CHAR(coding, src, src_base, src_end, charset, code, c) \ #define CODING_DECODE_CHAR(coding, src, src_base, src_end, charset, code, c) \
do { \ do { \
EMACS_INT offset; \
\
charset_map_loaded = 0; \ charset_map_loaded = 0; \
c = DECODE_CHAR (charset, code); \ c = DECODE_CHAR (charset, code); \
if (charset_map_loaded) \ if (charset_map_loaded \
&& (offset = coding_set_source (coding))) \
{ \ { \
const unsigned char *orig = coding->source; \
EMACS_INT offset; \
\
coding_set_source (coding); \
offset = coding->source - orig; \
src += offset; \ src += offset; \
src_base += offset; \ src_base += offset; \
src_end += offset; \ src_end += offset; \
} \ } \
} while (0) } while (0)
#define CODING_ENCODE_CHAR(coding, dst, dst_end, charset, c, code) \
do { \
EMACS_INT offset; \
\
charset_map_loaded = 0; \
code = ENCODE_CHAR (charset, c); \
if (charset_map_loaded \
&& (offset = coding_set_destination (coding))) \
{ \
dst += offset; \
dst_end += offset; \
} \
} while (0)
#define CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, code_return, charset) \
do { \
EMACS_INT offset; \
\
charset_map_loaded = 0; \
charset = char_charset (c, charset_list, code_return); \
if (charset_map_loaded \
&& (offset = coding_set_destination (coding))) \
{ \
dst += offset; \
dst_end += offset; \
} \
} while (0)
#define CODING_CHAR_CHARSET_P(coding, dst, dst_end, c, charset, result) \
do { \
EMACS_INT offset; \
\
charset_map_loaded = 0; \
result = CHAR_CHARSET_P (c, charset); \
if (charset_map_loaded \
&& (offset = coding_set_destination (coding))) \
{ \
dst += offset; \
dst_end += offset; \
} \
} while (0)
/* If there are at least BYTES length of room at dst, allocate memory /* If there are at least BYTES length of room at dst, allocate memory
for coding->destination and update dst and dst_end. We don't have for coding->destination and update dst and dst_end. We don't have
...@@ -1015,9 +1056,14 @@ record_conversion_result (struct coding_system *coding, ...@@ -1015,9 +1056,14 @@ record_conversion_result (struct coding_system *coding,
| ((p)[-1] & 0x3F)))) | ((p)[-1] & 0x3F))))
static void /* Update coding->source from coding->src_object, and return how many
bytes coding->source was changed. */
static EMACS_INT
coding_set_source (struct coding_system *coding) coding_set_source (struct coding_system *coding)
{ {
const unsigned char *orig = coding->source;
if (BUFFERP (coding->src_object)) if (BUFFERP (coding->src_object))
{ {
struct buffer *buf = XBUFFER (coding->src_object); struct buffer *buf = XBUFFER (coding->src_object);
...@@ -1036,11 +1082,18 @@ coding_set_source (struct coding_system *coding) ...@@ -1036,11 +1082,18 @@ coding_set_source (struct coding_system *coding)
/* Otherwise, the source is C string and is never relocated /* Otherwise, the source is C string and is never relocated
automatically. Thus we don't have to update anything. */ automatically. Thus we don't have to update anything. */
} }
return coding->source - orig;
} }
static void
/* Update coding->destination from coding->dst_object, and return how
many bytes coding->destination was changed. */
static EMACS_INT
coding_set_destination (struct coding_system *coding) coding_set_destination (struct coding_system *coding)
{ {
const unsigned char *orig = coding->destination;
if (BUFFERP (coding->dst_object)) if (BUFFERP (coding->dst_object))
{ {
if (BUFFERP (coding->src_object) && coding->src_pos < 0) if (BUFFERP (coding->src_object) && coding->src_pos < 0)
...@@ -1065,6 +1118,7 @@ coding_set_destination (struct coding_system *coding) ...@@ -1065,6 +1118,7 @@ coding_set_destination (struct coding_system *coding)
/* Otherwise, the destination is C string and is never relocated /* Otherwise, the destination is C string and is never relocated
automatically. Thus we don't have to update anything. */ automatically. Thus we don't have to update anything. */
} }
return coding->destination - orig;
} }
...@@ -2650,14 +2704,19 @@ encode_coding_emacs_mule (struct coding_system *coding) ...@@ -2650,14 +2704,19 @@ encode_coding_emacs_mule (struct coding_system *coding)
if (preferred_charset_id >= 0) if (preferred_charset_id >= 0)
{ {
int result;
charset = CHARSET_FROM_ID (preferred_charset_id); charset = CHARSET_FROM_ID (preferred_charset_id);
if (CHAR_CHARSET_P (c, charset)) CODING_CHAR_CHARSET_P (coding, dst, dst_end, c, charset, result);
if (result)
code = ENCODE_CHAR (charset, c); code = ENCODE_CHAR (charset, c);
else else
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
} }
else else
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
if (! charset) if (! charset)
{ {
c = coding->default_char; c = coding->default_char;
...@@ -2666,7 +2725,8 @@ encode_coding_emacs_mule (struct coding_system *coding) ...@@ -2666,7 +2725,8 @@ encode_coding_emacs_mule (struct coding_system *coding)
EMIT_ONE_ASCII_BYTE (c); EMIT_ONE_ASCII_BYTE (c);
continue; continue;
} }
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
} }
dimension = CHARSET_DIMENSION (charset); dimension = CHARSET_DIMENSION (charset);
emacs_mule_id = CHARSET_EMACS_MULE_ID (charset); emacs_mule_id = CHARSET_EMACS_MULE_ID (charset);
...@@ -4185,7 +4245,8 @@ decode_coding_iso_2022 (struct coding_system *coding) ...@@ -4185,7 +4245,8 @@ decode_coding_iso_2022 (struct coding_system *coding)
#define ENCODE_ISO_CHARACTER(charset, c) \ #define ENCODE_ISO_CHARACTER(charset, c) \
do { \ do { \
int code = ENCODE_CHAR ((charset), (c)); \ int code; \
CODING_ENCODE_CHAR (coding, dst, dst_end, (charset), (c), code); \
\ \
if (CHARSET_DIMENSION (charset) == 1) \ if (CHARSET_DIMENSION (charset) == 1) \
ENCODE_ISO_CHARACTER_DIMENSION1 ((charset), code); \ ENCODE_ISO_CHARACTER_DIMENSION1 ((charset), code); \
...@@ -4283,15 +4344,19 @@ encode_invocation_designation (struct charset *charset, ...@@ -4283,15 +4344,19 @@ encode_invocation_designation (struct charset *charset,
/* Produce designation sequences of charsets in the line started from /* Produce designation sequences of charsets in the line started from
SRC to a place pointed by DST, and return updated DST. CHARBUF to a place pointed by DST, and return the number of
produced bytes. DST should not directly point a buffer text area
which may be relocated by char_charset call.
If the current block ends before any end-of-line, we may fail to If the current block ends before any end-of-line, we may fail to
find all the necessary designations. */ find all the necessary designations. */
static unsigned char * static int
encode_designation_at_bol (struct coding_system *coding, int *charbuf, encode_designation_at_bol (struct coding_system *coding,
int *charbuf, int *charbuf_end,
unsigned char *dst) unsigned char *dst)
{ {
unsigned char *orig;
struct charset *charset; struct charset *charset;
/* Table of charsets to be designated to each graphic register. */ /* Table of charsets to be designated to each graphic register. */
int r[4]; int r[4];
...@@ -4309,7 +4374,7 @@ encode_designation_at_bol (struct coding_system *coding, int *charbuf, ...@@ -4309,7 +4374,7 @@ encode_designation_at_bol (struct coding_system *coding, int *charbuf,
for (reg = 0; reg < 4; reg++) for (reg = 0; reg < 4; reg++)
r[reg] = -1; r[reg] = -1;
while (found < 4) while (charbuf < charbuf_end && found < 4)
{ {
int id; int id;
...@@ -4334,7 +4399,7 @@ encode_designation_at_bol (struct coding_system *coding, int *charbuf, ...@@ -4334,7 +4399,7 @@ encode_designation_at_bol (struct coding_system *coding, int *charbuf,
ENCODE_DESIGNATION (CHARSET_FROM_ID (r[reg]), reg, coding); ENCODE_DESIGNATION (CHARSET_FROM_ID (r[reg]), reg, coding);
} }
return dst; return dst - orig;
} }
/* See the above "GENERAL NOTES on `encode_coding_XXX ()' functions". */ /* See the above "GENERAL NOTES on `encode_coding_XXX ()' functions". */
...@@ -4378,13 +4443,26 @@ encode_coding_iso_2022 (struct coding_system *coding) ...@@ -4378,13 +4443,26 @@ encode_coding_iso_2022 (struct coding_system *coding)
if (bol_designation) if (bol_designation)
{ {
unsigned char *dst_prev = dst;
/* We have to produce designation sequences if any now. */ /* We have to produce designation sequences if any now. */
dst = encode_designation_at_bol (coding, charbuf, dst); unsigned char desig_buf[16];
bol_designation = 0; int nbytes;
EMACS_INT offset;
charset_map_loaded = 0;
nbytes = encode_designation_at_bol (coding, charbuf, charbuf_end,
desig_buf);
if (charset_map_loaded
&& (offset = coding_set_destination (coding)))
{
dst += offset;
dst_end += offset;
}
memcpy (dst, desig_buf, nbytes);
dst += nbytes;
/* We are sure that designation sequences are all ASCII bytes. */ /* We are sure that designation sequences are all ASCII bytes. */
produced_chars += dst - dst_prev; produced_chars += nbytes;
bol_designation = 0;
ASSURE_DESTINATION (safe_room);
} }
c = *charbuf++; c = *charbuf++;
...@@ -4455,12 +4533,17 @@ encode_coding_iso_2022 (struct coding_system *coding) ...@@ -4455,12 +4533,17 @@ encode_coding_iso_2022 (struct coding_system *coding)
if (preferred_charset_id >= 0) if (preferred_charset_id >= 0)
{ {
int result;
charset = CHARSET_FROM_ID (preferred_charset_id); charset = CHARSET_FROM_ID (preferred_charset_id);
if (! CHAR_CHARSET_P (c, charset)) CODING_CHAR_CHARSET_P (coding, dst, dst_end, c, charset, result);
charset = char_charset (c, charset_list, NULL); if (! result)
CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
NULL, charset);
} }
else else
charset = char_charset (c, charset_list, NULL); CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
NULL, charset);
if (!charset) if (!charset)
{ {
if (coding->mode & CODING_MODE_SAFE_ENCODING) if (coding->mode & CODING_MODE_SAFE_ENCODING)
...@@ -4471,7 +4554,8 @@ encode_coding_iso_2022 (struct coding_system *coding) ...@@ -4471,7 +4554,8 @@ encode_coding_iso_2022 (struct coding_system *coding)
else else
{ {
c = coding->default_char; c = coding->default_char;
charset = char_charset (c, charset_list, NULL); CODING_CHAR_CHARSET (coding, dst, dst_end, c,
charset_list, NULL, charset);
} }
} }
ENCODE_ISO_CHARACTER (charset, c); ENCODE_ISO_CHARACTER (charset, c);
...@@ -4897,7 +4981,9 @@ encode_coding_sjis (struct coding_system *coding) ...@@ -4897,7 +4981,9 @@ encode_coding_sjis (struct coding_system *coding)
else else
{ {
unsigned code; unsigned code;
struct charset *charset = char_charset (c, charset_list, &code); struct charset *charset;
CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
if (!charset) if (!charset)
{ {
...@@ -4909,7 +4995,8 @@ encode_coding_sjis (struct coding_system *coding) ...@@ -4909,7 +4995,8 @@ encode_coding_sjis (struct coding_system *coding)
else else
{ {
c = coding->default_char; c = coding->default_char;
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c,
charset_list, &code, charset);
} }
} }
if (code == CHARSET_INVALID_CODE (charset)) if (code == CHARSET_INVALID_CODE (charset))
...@@ -4984,7 +5071,9 @@ encode_coding_big5 (struct coding_system *coding) ...@@ -4984,7 +5071,9 @@ encode_coding_big5 (struct coding_system *coding)
else else
{ {
unsigned code; unsigned code;
struct charset *charset = char_charset (c, charset_list, &code); struct charset *charset;
CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
if (! charset) if (! charset)
{ {
...@@ -4996,7 +5085,8 @@ encode_coding_big5 (struct coding_system *coding) ...@@ -4996,7 +5085,8 @@ encode_coding_big5 (struct coding_system *coding)
else else
{ {
c = coding->default_char; c = coding->default_char;
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c,
charset_list, &code, charset);
} }
} }
if (code == CHARSET_INVALID_CODE (charset)) if (code == CHARSET_INVALID_CODE (charset))
...@@ -5572,7 +5662,9 @@ encode_coding_charset (struct coding_system *coding) ...@@ -5572,7 +5662,9 @@ encode_coding_charset (struct coding_system *coding)
} }
else else
{ {
charset = char_charset (c, charset_list, &code); CODING_CHAR_CHARSET (coding, dst, dst_end, c, charset_list,
&code, charset);
if (charset) if (charset)
{ {
if (CHARSET_DIMENSION (charset) == 1) if (CHARSET_DIMENSION (charset) == 1)
......
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