From 2badceae641d795adddd048e4f9f8686d9768ae2 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 4 Aug 2017 15:55:45 +0000 Subject: merge revision(s) 59384: [Backport #13759] strscan.c: fix segfault in aref * ext/strscan/strscan.c (strscan_aref): fix segfault after get_byte or getch which do not apply regexp. [ruby-core:82116] [Bug #13759] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/strscan/strscan.c | 1 + test/strscan/test_stringscanner.rb | 10 ++++++++++ version.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 838f0e7f86..75cff3716f 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -1034,6 +1034,7 @@ strscan_aref(VALUE self, VALUE idx) idx = rb_sym2str(idx); /* fall through */ case T_STRING: + if (!p->regex) return Qnil; RSTRING_GETMEM(idx, name, i); i = name_to_backref_number(&(p->regs), p->regex, name, name + i, rb_enc_get(idx)); break; diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb index ee97e454fe..10dbf839e7 100644 --- a/test/strscan/test_stringscanner.rb +++ b/test/strscan/test_stringscanner.rb @@ -718,4 +718,14 @@ class TestStringScanner < Test::Unit::TestCase s.scan(/test strin/) assert_equal('#', s.inspect) end + + def test_aref_without_regex + s = StringScanner.new('abc') + s.get_byte + assert_nil(s[:c]) + assert_nil(s["c"]) + s.getch + assert_nil(s[:c]) + assert_nil(s["c"]) + end end diff --git a/version.h b/version.h index 611904b7d2..463319935c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-08-05" -#define RUBY_PATCHLEVEL 171 +#define RUBY_PATCHLEVEL 172 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 8 -- cgit v1.2.3