nagachika	2013-03-11 01:05:14 +0900 (Mon, 11 Mar 2013)

  New Revision: 39706

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

  Log:
    merge revision(s) 39495: [Backport #7954]
    
    * string.c (str_byte_substr): don't set coderange if it's not known.
      [Bug #7954] [ruby-dev:47108]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/string.c
    branches/ruby_2_0_0/test/ruby/test_string.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39705)
+++ ruby_2_0_0/ChangeLog	(revision 39706)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 11 01:04:54 2013  NARUSE, Yui  <naruse@r...>
+
+	* string.c (str_byte_substr): don't set coderange if it's not known.
+	  [Bug #7954] [ruby-dev:47108]
+
 Mon Mar 11 00:58:30 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (realclean-local): miniprelude.c is made by srcs, so it
Index: ruby_2_0_0/string.c
===================================================================
--- ruby_2_0_0/string.c	(revision 39705)
+++ ruby_2_0_0/string.c	(revision 39706)
@@ -4122,10 +4122,29 @@ str_byte_substr(VALUE str, long beg, lon https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/string.c#L4122
     }
     else {
 	str2 = rb_str_new5(str, p, len);
-	rb_enc_cr_str_copy_for_substr(str2, str);
-	OBJ_INFECT(str2, str);
     }
 
+    str_enc_copy(str2, str);
+
+    if (RSTRING_LEN(str2) == 0) {
+	if (!rb_enc_asciicompat(STR_ENC_GET(str)))
+	    ENC_CODERANGE_SET(str2, ENC_CODERANGE_VALID);
+	else
+	    ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT);
+    }
+    else {
+	switch (ENC_CODERANGE(str)) {
+	  case ENC_CODERANGE_7BIT:
+	    ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT);
+	    break;
+	  default:
+	    ENC_CODERANGE_SET(str2, ENC_CODERANGE_UNKNOWN);
+	    break;
+	}
+    }
+
+    OBJ_INFECT(str2, str);
+
     return str2;
 }
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39705)
+++ ruby_2_0_0/version.h	(revision 39706)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-11"
-#define RUBY_PATCHLEVEL 50
+#define RUBY_PATCHLEVEL 51
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/ruby/test_string.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_string.rb	(revision 39705)
+++ ruby_2_0_0/test/ruby/test_string.rb	(revision 39706)
@@ -2180,6 +2180,10 @@ class TestString < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_string.rb#L2180
     assert_equal(u("\x81\x82"), "\u3042".byteslice(1..2))
 
     assert_equal(u("\x82")+("\u3042"*9), ("\u3042"*10).byteslice(2, 28))
+
+    bug7954 = '[ruby-dev:47108]'
+    assert_equal(false, "\u3042".byteslice(0, 2).valid_encoding?)
+    assert_equal(false, ("\u3042"*10).byteslice(0, 20).valid_encoding?)
   end
 end
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39495


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