diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-09-18 16:11:19 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-09-18 16:11:19 +0900 |
| commit | 7b55ff21b52e818819b698326f80158643175645 (patch) | |
| tree | 453a90041608ca145fd45d518e24939b22016e71 /ext | |
| parent | e6e25b794d8db52e1df85a02f28846ad7eb82d49 (diff) | |
merge revision(s) 564ccd095a9d7fbe869031dbf666d61dadfdcb03: [Backport #17756]
[ruby/strscan] Fix segmentation fault of `StringScanner#charpos` when
`String#byteslice` returns non string value [Bug #17756] (#20)
https://github.com/ruby/strscan/commit/92961cde2b
---
ext/strscan/strscan.c | 5 +----
test/strscan/test_stringscanner.rb | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/strscan/strscan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 88074a0a26..fb722ecefa 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -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))); } /* |