From a9280ca7c91c38b5135ca63ae0bbdb669e589f28 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 27 Sep 2005 23:12:43 +0000 Subject: * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00b9309d51..94326667bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 28 08:12:18 2005 Nobuyoshi Nakada + + * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334] + Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo. diff --git a/io.c b/io.c index 24533a6e89..0d97b16e6a 100644 --- a/io.c +++ b/io.c @@ -1020,8 +1020,10 @@ read_buffered_data(ptr, len, f) if (n > len) n = len; return fread(ptr, 1, n, f); #else - for (n = 0; n < len && READ_DATA_PENDING(f); ++n) { - *ptr++ = getc(f); + int c; + + for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) { + *ptr++ = c; } return n; #endif -- cgit v1.2.3