diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-26 12:45:20 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-26 12:45:20 +0000 |
| commit | 5da53fa702e567e423ce8976ba2f30dd8837a637 (patch) | |
| tree | 79858c355767eee8c135c1008efa70c9baa1e957 | |
| parent | 0d5fe384c6662c369097c003dd9683925c4e9f28 (diff) | |
| download | ruby-5da53fa702e567e423ce8976ba2f30dd8837a637.tar.gz ruby-5da53fa702e567e423ce8976ba2f30dd8837a637.tar.xz ruby-5da53fa702e567e423ce8976ba2f30dd8837a637.zip | |
* transcode.c (rb_econv_binmode): binmode is effective only once.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Tue Aug 26 21:44:39 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (rb_econv_binmode): binmode is effective only once. + Tue Aug 26 19:27:54 2008 Akinori MUSHA <knu@iDaemons.org> * test/ruby/test_enum.rb (TestEnumerable#test_each_with_object): diff --git a/transcode.c b/transcode.c index 8a57054eb..108a44b88 100644 --- a/transcode.c +++ b/transcode.c @@ -1476,12 +1476,14 @@ rb_econv_binmode(rb_econv_t *ec) ec->elems[i].out_data_end = NULL; ec->elems[i].out_buf_end = NULL; ec->num_trans--; + ec->opts.flags &= ~ECONV_UNIVERSAL_NEWLINE_DECODER; } if (ec->opts.flags & (ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER)) { rb_transcoding_close(ec->elems[0].tc); xfree(ec->elems[0].out_buf_start); MEMMOVE(&ec->elems[0], &ec->elems[1], rb_econv_elem_t, ec->num_trans-1); ec->num_trans--; + ec->opts.flags &= ~(ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER); } } |