From 7be6cbef51c76402295bb6638b1b53adde6e8e2d Mon Sep 17 00:00:00 2001 From: wanabe Date: Mon, 16 Nov 2009 05:06:16 +0000 Subject: * io.c (read_all): shift read buffer if exception occured. pointed out in [ruby-dev:39702]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'io.c') diff --git a/io.c b/io.c index 5479b9c0f..17ee292f5 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); } -- cgit