diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-18 15:00:00 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-18 15:00:00 +0000 |
commit | 6effaa9a139eadf99a606af293e4d39ce6dc1182 (patch) | |
tree | 18a361adb79338b8a83770a90de7a42eb416095b /io.c | |
parent | e623ceb9f9092616be590b1f5e1a71ddbb18c0b3 (diff) |
* io.c (fill_cbuf): finish reading at EOF, and the readconv has
been cleared by another thread while io_fillbuf() is waiting at
select(). a patch in [ruby-core:37197] by Hiroshi Shirosaki
<h.shirosaki AT gmail.com>. fixed #3840
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1717,6 +1717,9 @@ fill_cbuf(rb_io_t *fptr, int ec_flags) if (fptr->rbuf.len == 0) { READ_CHECK(fptr); if (io_fillbuf(fptr) == -1) { + if (!fptr->readconv) { + return MORE_CHAR_FINISHED; + } ds = dp = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.off + fptr->cbuf.len; de = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.capa; res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0); |