From 564ccd095a9d7fbe869031dbf666d61dadfdcb03 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 31 Mar 2021 14:56:28 +0900 Subject: [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 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ext/strscan') diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index 6c9ebcd124..7eb6181203 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.1