From aaf1f031be253f2f24ed19c322398b7694c88a50 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 28 Mar 2018 05:51:05 +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_3@62946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ string.c | 1 + test/ruby/test_string.rb | 6 ++++++ version.h | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4e8cb1e8f5..f10e10c58b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 28 14:50:52 2018 Nobuyoshi Nakada + + 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 win32.c: memcpy instead of strlcpy diff --git a/string.c b/string.c index 84533e7efe..0021c53e3a 100644 --- a/string.c +++ b/string.c @@ -2287,6 +2287,7 @@ rb_str_substr(VALUE str, long beg, long len) 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); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index f61aa3e2c4..bb89df8133 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -2330,6 +2330,12 @@ class TestString < Test::Unit::TestCase 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 diff --git a/version.h b/version.h index 11cd402ad8..26109f907e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3