summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-25 01:26:49 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-25 01:26:49 +0000
commit7d783091a2a1566519f4671fe94aa3866006fdbc (patch)
tree677c16fcb569dd464a4a210a5f4c183573c3d971 /io.c
parent35eac123de94c412415d33ed2c51bbdb98a8d707 (diff)
* io.c (read_all): [ruby-dev:24955]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/io.c b/io.c
index 4ac42da..ec37d03 100644
--- a/io.c
+++ b/io.c
@@ -1010,9 +1010,10 @@ read_all(fptr, siz, str)
if (siz == 0) siz = BUFSIZ;
if (NIL_P(str)) {
- str = rb_tainted_str_new(0, siz);
+ str = rb_str_new(0, siz);
}
else {
+ StringValue(str);
rb_str_resize(str, siz);
}
for (;;) {
@@ -1033,6 +1034,7 @@ read_all(fptr, siz, str)
rb_str_resize(str, siz);
}
if (bytes != siz) rb_str_resize(str, bytes);
+ OBJ_TAINT(str);
return str;
}
@@ -1074,7 +1076,7 @@ io_read(argc, argv, io)
}
if (NIL_P(str)) {
- str = rb_str_new(0, len);
+ str = rb_tainted_str_new(0, len);
}
else {
StringValue(str);