yugui	2011-05-30 13:43:29 +0900 (Mon, 30 May 2011)

  New Revision: 31809

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31809

  Log:
    merges r31310 from trunk into ruby_1_9_2.
    --
    * string.c (rb_str_each_line): check string's length when compare
      separator and string. [ruby-core:35815] fixes #4586

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31808)
+++ ruby_1_9_2/ChangeLog	(revision 31809)
@@ -1,3 +1,8 @@
+Wed Apr 20 14:41:28 2011  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_str_each_line): check string's length when compare
+	  separator and string. [ruby-core:35815] fixes #4586
+
 Mon Apr 18 12:15:46 2011  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 31808)
+++ ruby_1_9_2/string.c	(revision 31809)
@@ -5828,7 +5828,8 @@
 	    p -= n;
 	}
 	if (c == newline &&
-	    (rslen <= 1 || memcmp(RSTRING_PTR(rs), p, rslen) == 0)) {
+	    (rslen <= 1 ||
+	     (pend - p >= rslen && memcmp(RSTRING_PTR(rs), p, rslen) == 0))) {
 	    line = rb_str_new5(str, s, p - s + (rslen ? rslen : n));
 	    OBJ_INFECT(line, str);
 	    rb_enc_cr_str_copy_for_substr(line, str);
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31808)
+++ ruby_1_9_2/version.h	(revision 31809)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/