Fix segmentation fault of StringScanner#charpos when String#byteslice returns non string value [Bug #17756]
#20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kachick
changed the title
StringScanner#charpos when target.byteslice returns non string valueStringScanner#charpos when target.byteslice returns non string value [Bug #17756]
rhenium
reviewed
Mar 28, 2021
ext/strscan/strscan.c
Outdated
| @@ -450,6 +450,7 @@ strscan_get_charpos(VALUE self) | |||
| GET_SCANNER(self, p); | |||
|
|
|||
| substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), LONG2NUM(p->curr)); | |||
| Check_Type(substr, T_STRING); | |||
There was a problem hiding this comment.
Would it make sense to rather use rb_enc_strlen(), which takes char * directly? It seems like a waste to create a String object just for this.
There was a problem hiding this comment.
Sounds good! Thank you for letting me know, I didn't know the feature 😅
How about like this 02bfa2c ?
Tests passed in Ruby 3.0.0. But I'm a newbie in C, so I'm afraid something wrong 🙏
kou
reviewed
Mar 28, 2021
#20 (comment) Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
#20 (comment) Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
kachick
commented
Mar 30, 2021
test/strscan/test_stringscanner.rb
Outdated
Comment on lines
209
to
219
| def test_charpos_not_use_byteslice | ||
| string = +'ruby' | ||
| scanner = create_string_scanner(string) | ||
| pre = Module.new do | ||
| def byteslice(*args) | ||
| end | ||
| end | ||
| string.singleton_class.prepend(pre) | ||
| assert_equal(0, scanner.charpos) | ||
| end | ||
|
|
There was a problem hiding this comment.
I'm not sure this tests are really need for now?
It aims regression tests, but I feel a bit meaningless since #20 (comment), 02bfa2c 😅
There was a problem hiding this comment.
How do you think this change? 1531d35 🤔
kachick
changed the title
StringScanner#charpos when target.byteslice returns non string value [Bug #17756]StringScanner#charpos when String#byteslice returns non string value [Bug #17756]
|
Thanks! |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ref: https://bugs.ruby-lang.org/issues/17756
This code makes segmentation fault.
The crash report.