From 98cf9c43fa18bf0874af47b9d1b4933981ea456d Mon Sep 17 00:00:00 2001 From: wanabe Date: Mon, 16 Nov 2009 05:06:16 +0000 Subject: [PATCH] * io.c (read_all): shift read buffer if exception occured. pointed out in [ruby-dev:39702]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3fb2ee29b1..754c91411d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 16 14:03:53 2009 wanabe + + * io.c (read_all): shift read buffer if exception occured. + pointed out in [ruby-dev:39702]. + Mon Nov 16 07:59:38 2009 wanabe * io.c (read_all): don't call io_shift_cbuf until bufffering enough or diff --git a/io.c b/io.c index 5479b9c0f0..17ee292f5b 100644 --- a/io.c +++ b/io.c @@ -1686,13 +1686,20 @@ read_all(rb_io_t *fptr, long siz, VALUE str) else rb_str_set_len(str, 0); make_readconv(fptr, 0); while (1) { + int fin, state = 0; + if (fptr->cbuf_len > fptr->cbuf_capa / 2) { io_shift_cbuf(fptr, fptr->cbuf_len, &str); } - if (more_char(fptr) == -1) { + + fin = rb_protect((VALUE (*)(VALUE))more_char, (VALUE)fptr, &state); + if (fin == -1 || state != 0) { if (fptr->cbuf_len) { io_shift_cbuf(fptr, fptr->cbuf_len, &str); } + if (state != 0) { + rb_jump_tag(state); + } clear_readconv(fptr); return io_enc_str(str, fptr); }