diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-27 23:12:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-27 23:12:43 +0000 |
| commit | d5fa880489ab46d619876a90cca734557404e517 (patch) | |
| tree | 51b90607e1ceabef81263c5aba4ec7acffa5c7d3 | |
| parent | f157745db18829cb0bc81d091193dbc21ffc4329 (diff) | |
| download | ruby-d5fa880489ab46d619876a90cca734557404e517.tar.gz ruby-d5fa880489ab46d619876a90cca734557404e517.tar.xz ruby-d5fa880489ab46d619876a90cca734557404e517.zip | |
* io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Sep 28 08:12:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334] + Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo. @@ -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 |
