From 256541d9458ccfc63b7f59f2dee60db777161dd1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 24 Nov 2010 07:38:34 +0000 Subject: merge revision(s) 26140: * ext/stringio/stringio.c (strio_getline): fix for "" as separator. [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/stringio/stringio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index cd68185dc4..14ae2dc117 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -933,7 +933,7 @@ strio_getline(argc, argv, ptr) s = p; while ((p = memchr(p, '\n', e - p)) && (p != e)) { if (*++p == '\n') { - e = p; + e = p + 1; break; } } -- cgit v1.2.3