From 681d1e79b734c8dfd2580448e60bf26bd1d8d16f Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 21 Mar 2018 15:04:00 +0000 Subject: 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]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 1 + test/ruby/test_string.rb | 6 ++++++ version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/string.c b/string.c index 0a5f802452..c065a8e2b6 100644 --- a/string.c +++ b/string.c @@ -2451,6 +2451,7 @@ str_substr(VALUE str, long beg, long len, int empty) 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 { if (!len && !empty) return Qnil; diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 6a055f1330..a375ff5de8 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -2569,6 +2569,12 @@ CODE assert_equal("\u3042", "\u3042\u3043".chr) assert_equal('', ''.chr) 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 diff --git a/version.h b/version.h index 6c44937809..7c9e0c5b4e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-21" -#define RUBY_PATCHLEVEL 278 +#define RUBY_PATCHLEVEL 279 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3