usa	2018-03-28 14:51:05 +0900 (Wed, 28 Mar 2018)

  New Revision: 62946

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62946

  Log:
    merge revision(s) 62040: [Backport #14388]
    
    string.c: clear substring code range
    
    * string.c (str_substr): substring of broken code range string may
      be valid or broken.  patch by tommy (Masahiro Tomita) at
      [ruby-dev:50430] [Bug #14388].

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/string.c
    branches/ruby_2_3/test/ruby/test_string.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62945)
+++ ruby_2_3/version.h	(revision 62946)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-28"
-#define RUBY_PATCHLEVEL 442
+#define RUBY_PATCHLEVEL 443
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62945)
+++ ruby_2_3/ChangeLog	(revision 62946)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Mar 28 14:50:52 2018  Nobuyoshi Nakada  <nobu@r...>
+
+	string.c: clear substring code range
+
+	* string.c (str_substr): substring of broken code range string may be
+	  valid or broken. patch by tommy (Masahiro Tomita) at [Bug #14388].
+
 Thu Mar 28 14:48:13 2018  Nobuyoshi Nakada  <nobu@r...>
 
 	win32.c: memcpy instead of strlcpy
Index: ruby_2_3/string.c
===================================================================
--- ruby_2_3/string.c	(revision 62945)
+++ ruby_2_3/string.c	(revision 62946)
@@ -2287,6 +2287,7 @@ rb_str_substr(VALUE str, long beg, long https://github.com/ruby/ruby/blob/trunk/ruby_2_3/string.c#L2287
 	str2 = str_new_shared(rb_obj_class(str2), str2);
 	RSTRING(str2)->as.heap.ptr += ofs;
 	RSTRING(str2)->as.heap.len = len;
+	ENC_CODERANGE_CLEAR(str2);
     }
     else {
 	str2 = rb_str_new_with_class(str, p, len);
Index: ruby_2_3/test/ruby/test_string.rb
===================================================================
--- ruby_2_3/test/ruby/test_string.rb	(revision 62945)
+++ ruby_2_3/test/ruby/test_string.rb	(revision 62946)
@@ -2330,6 +2330,12 @@ class TestString < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_string.rb#L2330
     assert_not_equal(str.object_id, (+str).object_id)
     assert_equal(str.object_id, (-str).object_id)
   end
+
+  def test_substr_code_range
+    data = "\xff" + "a"*200
+    assert_not_predicate(data, :valid_encoding?)
+    assert_predicate(data[100..-1], :valid_encoding?)
+  end
 end
 
 class TestString2 < TestString
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62945)
+++ ruby_2_3	(revision 62946)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r62040

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