diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,9 @@ -Thu Jun 19 20:37:00 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Wed Nov 24 13:27:34 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * ext/stringio/stringio.c (strio_getline): fix for "" as separator. + [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk). + +Wed Nov 24 13:27:20 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * lib/net/pop.rb (Net::POP3#set_all_uids): speed up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047] 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; } } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-11-24" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101124 -#define RUBY_PATCHLEVEL 320 +#define RUBY_PATCHLEVEL 321 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |