summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-26 04:30:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-26 04:30:45 +0000
commit0db5641dae711ccb3e34cc195e14f95571c22f90 (patch)
tree3cc6837b7abd9b1d9c407d109dda0b8000754278 /io.c
parentc68aaa94f713299799708b53993fe29c14d7a87c (diff)
* io.c (read_all): use the given buffer to read when needs readconv.
based on the patch by wanabe <s.wanabe AT gmail.com> at [ruby-dev:36931]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io.c b/io.c
index bfeefef432..125180b925 100644
--- a/io.c
+++ b/io.c
@@ -1556,7 +1556,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
int cr;
if (NEED_READCONV(fptr)) {
- VALUE str = rb_str_new(NULL, 0);
+ if (!NIL_P(str)) rb_str_set_len(str, 0);
make_readconv(fptr);
while (1) {
if (fptr->cbuf_len) {