From 7b55ff21b52e818819b698326f80158643175645 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 18 Sep 2021 16:11:19 +0900 Subject: 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(-) --- ext/strscan/strscan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ext') 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))); } /* -- cgit v1.2.3