From f22e484a70bc5f1478d2bd78a0d1994d5bb384aa Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 15 Aug 2008 09:33:59 +0000 Subject: * include/ruby/encoding.h (rb_econv_t): add error_tc in last_error. * transcode.c (rb_econv_convert): fill error_tc. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- transcode.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'transcode.c') diff --git a/transcode.c b/transcode.c index 92d9ec62f..a814eb988 100644 --- a/transcode.c +++ b/transcode.c @@ -950,11 +950,13 @@ rb_econv_convert(rb_econv_t *ec, ec->last_error.partial_input = flags & ECONV_PARTIAL_INPUT; if (res == econv_invalid_byte_sequence || res == econv_undefined_conversion) { - ec->last_error.source_encoding = ec->elems[result_position].tc->transcoder->from_encoding; - ec->last_error.destination_encoding = ec->elems[result_position].tc->transcoder->to_encoding; - ec->last_error.error_bytes_start = TRANSCODING_READBUF(ec->elems[result_position].tc); - ec->last_error.error_bytes_len = ec->elems[result_position].tc->recognized_len; - ec->last_error.readagain_len = ec->elems[result_position].tc->readagain_len; + rb_transcoding *error_tc = ec->elems[result_position].tc; + ec->last_error.error_tc = error_tc; + ec->last_error.source_encoding = error_tc->transcoder->from_encoding; + ec->last_error.destination_encoding = error_tc->transcoder->to_encoding; + ec->last_error.error_bytes_start = TRANSCODING_READBUF(error_tc); + ec->last_error.error_bytes_len = error_tc->recognized_len; + ec->last_error.readagain_len = error_tc->readagain_len; } return res; -- cgit