Skip to content

Fix segmentation fault of StringScanner#charpos when String#byteslice returns non string value [Bug #17756] #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 7 commits into from
Mar 31, 2021
Merged

Fix segmentation fault of StringScanner#charpos when String#byteslice returns non string value [Bug #17756] #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c742384
Add test for segmentation fault case of StringScanner#charpos
kachick Mar 27, 2021
986e6d4
Ensure no segfault even if target.byteslice returns no string value
kachick Mar 27, 2021
f4da839
Fix a typo
kachick Mar 28, 2021
02bfa2c
Avoid to depend String#byteslice
kachick Mar 28, 2021
89e7b33
Avoid `assert_nothing_raised`
kachick Mar 30, 2021
ab32d17
Improve test case name
kachick Mar 30, 2021
1531d35
Update charpos regression test
kachick Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ext/strscan/strscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,13 +445,10 @@ static VALUE
strscan_get_charpos(VALUE self)
{
struct strscanner *p;
VALUE substr;

GET_SCANNER(self, p);

substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), LONG2NUM(p->curr));

return rb_str_length(substr);
return LONG2NUM(rb_enc_strlen(S_PBEG(p), CURPTR(p), rb_enc_get(p->str)));
}

/*
Expand Down
17 changes: 17 additions & 0 deletions test/strscan/test_stringscanner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,23 @@ def test_pos_unicode
assert_equal 11, s.charpos
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
s = create_string_scanner('a'.dup)
s.scan(/a/)
Expand Down