summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-07 05:54:28 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-07 05:54:28 +0000
commit68a9d6820d547e89babba6b8d5bae10b5096c19a (patch)
tree75d9fe12b45dad0982c78f94bcfb8bed44115ea6
parent46c777ac1468aa406478ce00bf6acdc430218d6d (diff)
* io.c (io_read): should freeze buffer before thread context
switch. [ruby-dev:24442] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--io.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0085a8dd5b..3ca3465f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
Thu Oct 7 12:55:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (io_read): should freeze buffer before thread context
+ switch. [ruby-dev:24442]
+
* pack.c (pack_unpack): string conversion should at the top of the
method. [ruby-dev:24439]
diff --git a/io.c b/io.c
index ffff98f9e4..186fabfd0f 100644
--- a/io.c
+++ b/io.c
@@ -1070,8 +1070,8 @@ io_read(argc, argv, io)
}
if (len == 0) return str;
- READ_CHECK(fptr->f);
FL_SET(str, FL_FREEZE);
+ READ_CHECK(fptr->f);
n = rb_io_fread(RSTRING(str)->ptr, len, fptr->f);
FL_UNSET(str, FL_FREEZE);
if (n == 0) {