ruby-changes:13987
From: wanabe <ko1@a...>
Date: Mon, 16 Nov 2009 14:06:38 +0900 (JST)
Subject: [ruby-changes:13987] Ruby:r25795 (trunk): * io.c (read_all): shift read buffer if exception occured.
wanabe 2009-11-16 14:06:16 +0900 (Mon, 16 Nov 2009) New Revision: 25795 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25795 Log: * io.c (read_all): shift read buffer if exception occured. pointed out in [ruby-dev:39702]. Modified files: trunk/ChangeLog trunk/io.c Index: ChangeLog =================================================================== --- ChangeLog (revision 25794) +++ ChangeLog (revision 25795) @@ -1,3 +1,8 @@ +Mon Nov 16 14:03:53 2009 wanabe <s.wanabe@g...> + + * io.c (read_all): shift read buffer if exception occured. + pointed out in [ruby-dev:39702]. + Mon Nov 16 07:59:38 2009 wanabe <s.wanabe@g...> * io.c (read_all): don't call io_shift_cbuf until bufffering enough or Index: io.c =================================================================== --- io.c (revision 25794) +++ io.c (revision 25795) @@ -1686,13 +1686,20 @@ 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); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/