naruse	2013-02-25 21:18:48 +0900 (Mon, 25 Feb 2013)

  New Revision: 39495

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

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

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_string.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39494)
+++ ChangeLog	(revision 39495)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 25 21:03:34 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 Feb 25 16:47:02 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (realclean-local): miniprelude.c is made by srcs, so it
Index: string.c
===================================================================
--- string.c	(revision 39494)
+++ string.c	(revision 39495)
@@ -4124,10 +4124,29 @@ str_byte_substr(VALUE str, long beg, lon https://github.com/ruby/ruby/blob/trunk/string.c#L4124
     }
     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: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 39494)
+++ test/ruby/test_string.rb	(revision 39495)
@@ -2181,6 +2181,10 @@ class TestString < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_string.rb#L2181
     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
 

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