diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 10:30:58 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 10:30:58 +0000 |
| commit | 6b330d8fb0b855134b05a38082f1172836b8b567 (patch) | |
| tree | 272428a7bd5644e364e882c078d81a159ba42a88 | |
| parent | 3825bbfca96abdcef6d124cb85b855151749d826 (diff) | |
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_3@59545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/strscan/strscan.c | 1 | ||||
| -rw-r--r-- | test/strscan/test_stringscanner.rb | 10 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Aug 9 19:30:34 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/strscan/strscan.c (strscan_aref): fix segfault after + get_byte or getch which do not apply regexp. + [Bug #13759] + Wed Aug 9 19:28:40 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: add rpath flags which is needed for OPTDIR as well diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index ba2c4eb1a0..05a62da405 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('#<StringScanner 10/16 "...strin" @ "g tes...">', 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-08-09" -#define RUBY_PATCHLEVEL 355 +#define RUBY_PATCHLEVEL 356 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 8 |