1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/strscan] Fix segmentation fault of StringScanner#charpos when String#byteslice returns non string value [Bug #17756] (#20)

Browse Source 
https://github.com/ruby/strscan/commit/92961cde2b
This commit is contained in:
Kenichi Kamiya 2021-03-31 14:56:28 +09:00 committed by Hiroshi SHIBATA
parent 822eb94563
commit 564ccd095a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/strscan/strscan.c
View File

@ -445,13 +445,10 @@ static VALUE
strscan_get_charpos(VALUE self) strscan_get_charpos(VALUE self)
{ {
struct strscanner *p; struct strscanner *p;
VALUE substr;
GET_SCANNER(self, p); GET_SCANNER(self, p);
substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), LONG2NUM(p->curr)); return LONG2NUM(rb_enc_strlen(S_PBEG(p), CURPTR(p), rb_enc_get(p->str)));
return rb_str_length(substr);
} }
/* /*

17
test/strscan/test_stringscanner.rb
View File

@ -206,6 +206,23 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal 11, s.charpos assert_equal 11, s.charpos
end end
def test_charpos_not_use_string_methods
string = +'abcädeföghi'
scanner = create_string_scanner(string)
class << string
EnvUtil.suppress_warning do
undef_method(*instance_methods)
end
end
assert_equal 0, scanner.charpos
assert_equal "abcä", scanner.scan_until(/ä/)
assert_equal 4, scanner.charpos
assert_equal "defö", scanner.scan_until(/ö/)
assert_equal 8, scanner.charpos
end
def test_concat def test_concat
s = create_string_scanner('a'.dup) s = create_string_scanner('a'.dup)
s.scan(/a/) s.scan(/a/)