diff options
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/transcode.c b/transcode.c index bc1597e5b0..add97c9695 100644 --- a/transcode.c +++ b/transcode.c @@ -480,7 +480,7 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos, while (1) { inchar_start = in_p; tc->recognized_len = 0; - next_table = tr->conv_tree_start; + next_table = ((uintptr_t)tr->word_array) + tr->conv_tree_start; SUSPEND_OUTPUT_FOLLOWED_BY_INPUT(24); @@ -498,7 +498,8 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos, next_info = INVALID; else { unsigned int next_offset = BL_BASE(next_table)[2+next_byte-BL_BASE(next_table)[0]]; - next_info = (VALUE)BYTE_LOOKUP_INFO(next_table)[next_offset]; +#define BL_INFO(next_table) ((const struct byte_lookup *const *)(((uintptr_t)tr->word_array) + BYTE_LOOKUP_INFO(next_table))) + next_info = (VALUE)BL_INFO(next_table)[next_offset]; } follow_info: switch (next_info & 0x1F) { @@ -514,7 +515,7 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos, SUSPEND(econv_source_buffer_empty, 5); } next_byte = (unsigned char)*in_p++; - next_table = next_info; + next_table = ((uintptr_t)tr->word_array) + next_info; goto follow_byte; case ZERObt: /* drop input */ continue; |