diff options
| author | Kenichi Kamiya <kachick1@gmail.com> | 2021-03-31 14:56:28 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-05-06 16:20:38 +0900 |
| commit | 564ccd095a9d7fbe869031dbf666d61dadfdcb03 (patch) | |
| tree | 45cc3d8161e3f225281dd66dbba1e622661fc8c8 /ext/strscan | |
| parent | 822eb945635974ba904393cd130071d34e4bdc12 (diff) | |
[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
Diffstat (limited to 'ext/strscan')
| -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 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))); } /* |