diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 16:06:33 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 16:06:33 +0000 |
| commit | 8eda80ff2cde551e22e9a9803e932184aafdbf38 (patch) | |
| tree | 47cc804c9faf9827adaa3ed799fd2eacfd5c31f0 /transcode.c | |
| parent | c9453ecc049269a637d5d39daa927fc9b4a462b0 (diff) | |
| download | ruby-8eda80ff2cde551e22e9a9803e932184aafdbf38.tar.gz | |
* transcode.c (econv_primitive_convert): set destination_buffer
encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/transcode.c b/transcode.c index b8c8d1a1ae..2e189b935b 100644 --- a/transcode.c +++ b/transcode.c @@ -1676,6 +1676,10 @@ econv_primitive_convert(int argc, VALUE *argv, VALUE self) rb_str_set_len(output, op-(unsigned char *)RSTRING_PTR(output)); rb_str_drop_bytes(input, ip - (unsigned char *)RSTRING_PTR(input)); + if (ec->destination_encoding) { + rb_enc_associate(output, ec->destination_encoding); + } + switch (res) { case econv_invalid_byte_sequence: return ID2SYM(rb_intern("invalid_byte_sequence")); case econv_undefined_conversion: return ID2SYM(rb_intern("undefined_conversion")); |