From e835b9fd0ccd4efbf593b4065912e114da21d1dd Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 26 Oct 2004 14:52:40 +0000 Subject: * io.c (rb_io_getline): rs modification check should not interfere in the loop. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- io.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbd834fde..c7517fe89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +Tue Oct 26 23:52:32 2004 Nobuyoshi Nakada + + * io.c (rb_io_getline): rs modification check should not interfere in the loop. + Tue Oct 26 23:30:39 2004 Dave Thomas - * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module): + * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module): Restore correct :nopdoc: behavior with nested classes and modules. Mon Oct 25 18:35:39 2004 WATANABE Hirofumi diff --git a/io.c b/io.c index 59dc9265c..01ff8c9d0 100644 --- a/io.c +++ b/io.c @@ -1301,7 +1301,7 @@ rb_io_getline(rs, fptr) while ((c = appendline(fptr, newline, &str)) != EOF && (c != newline || RSTRING(str)->len < rslen || - (rspara || rscheck(rsptr,rslen,rs)) || + (rspara || rscheck(rsptr,rslen,rs), 0) || memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen))); if (rspara) { -- cgit