diff options
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index 64bad7ccbe8..e68700c099d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7266,13 +7266,17 @@ produce_charset (struct coding_system *coding, int *charbuf, ptrdiff_t pos) } #define MAX_CHARBUF_SIZE 0x4000 -#define MIN_CHARBUF_SIZE 0x10 +/* How many units decoding functions expect in coding->charbuf at + most. Currently, decode_coding_emacs_mule expects the following + size, and that is the largest value. */ +#define MAX_CHARBUF_EXTRA_SIZE ((MAX_ANNOTATION_LENGTH * 3) + 1) #define ALLOC_CONVERSION_WORK_AREA(coding, size) \ do { \ - int units = ((size) > MAX_CHARBUF_SIZE ? MAX_CHARBUF_SIZE \ - : (size) < MIN_CHARBUF_SIZE ? MIN_CHARBUF_SIZE \ - : size); \ + int units = (size) + MAX_CHARBUF_EXTRA_SIZE; \ + \ + if (units > MAX_CHARBUF_SIZE) \ + units = MAX_CHARBUF_SIZE; \ coding->charbuf = SAFE_ALLOCA ((units) * sizeof (int)); \ coding->charbuf_size = (units); \ } while (0) |