nagachika	2018-11-30 20:59:43 +0900 (Fri, 30 Nov 2018)

  New Revision: 66105

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

  Log:
    merge revision(s) 65956:
    
    fix r65954; Keep tainty

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/string.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/string.c
===================================================================
--- ruby_2_5/string.c	(revision 66104)
+++ ruby_2_5/string.c	(revision 66105)
@@ -8368,7 +8368,7 @@ rb_str_enumerate_grapheme_clusters(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_5/string.c#L8368
     VALUE orig = str;
     regex_t *reg_grapheme_cluster = NULL;
     rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str));
-    const char *ptr, *end;
+    const char *ptr0, *ptr, *end;
 
     if (!rb_enc_unicode_p(enc)) {
 	return rb_str_enumerate_chars(str, ary);
@@ -8376,7 +8376,7 @@ rb_str_enumerate_grapheme_clusters(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_5/string.c#L8376
 
     if (!ary) str = rb_str_new_frozen(str);
     reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
-    ptr = RSTRING_PTR(str);
+    ptr0 = ptr = RSTRING_PTR(str);
     end = RSTRING_END(str);
 
     while (ptr < end) {
@@ -8384,7 +8384,7 @@ rb_str_enumerate_grapheme_clusters(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_5/string.c#L8384
 				      (const OnigUChar *)ptr, (const OnigUChar *)end,
 				      (const OnigUChar *)ptr, NULL, 0);
 	if (len <= 0) break;
-	ENUM_ELEM(ary, rb_enc_str_new(ptr, len, enc));
+	ENUM_ELEM(ary, rb_str_subseq(str, ptr-ptr0, len));
 	ptr += len;
     }
     RB_GC_GUARD(str);
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66104)
+++ ruby_2_5/version.h	(revision 66105)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2018-11-28"
-#define RUBY_PATCHLEVEL 114
+#define RUBY_RELEASE_DATE "2018-11-30"
+#define RUBY_PATCHLEVEL 115
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66104)
+++ ruby_2_5	(revision 66105)

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

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