merge revision(s) 564ccd0: [Backport #17756]

nagachika · nagachika · commit 7b55ff21b52e · 2021-09-18T16:11:19.000+09:00
[ruby/strscan] Fix segmentation fault of `StringScanner#charpos` when `String#byteslice` returns non string value [Bug #17756] (#20) ruby/strscan@92961cde2b --- ext/strscan/strscan.c | 5 +---- test/strscan/test_stringscanner.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-)
diff --git 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)));
 }
 
 /*
diff --git a/test/strscan/test_stringscanner.rb b/test/strscan/test_stringscanner.rb
@@ -206,6 +206,23 @@ def test_pos_unicode
     assert_equal 11, s.charpos
   end
 
+  def test_charpos_not_use_string_methods
+    string = +'abc&auml;def&ouml;ghi'
+    scanner = create_string_scanner(string)
+
+    class << string
+      EnvUtil.suppress_warning do
+        undef_method(*instance_methods)
+      end
+    end
+
+    assert_equal 0, scanner.charpos
+    assert_equal "abc&auml;", scanner.scan_until(/&auml;/)
+    assert_equal 4, scanner.charpos
+    assert_equal "def&ouml;", scanner.scan_until(/&ouml;/)
+    assert_equal 8, scanner.charpos
+  end
+
   def test_concat
     s = create_string_scanner('a'.dup)
     s.scan(/a/)
diff --git a/version.h b/version.h
@@ -12,7 +12,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 9

Original file line number	Diff line number	Diff line change
`@@ -445,13 +445,10 @@ static VALUE`
`445`	`445`	`strscan_get_charpos(VALUE self)`
`446`	`446`	`{`
`447`	`447`	`struct strscanner *p;`
`448`		`- VALUE substr;`
`449`	`448`
`450`	`449`	`GET_SCANNER(self, p);`
`451`	`450`
`452`		`- substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), LONG2NUM(p->curr));`
`453`		`-`
`454`		`- return rb_str_length(substr);`
	`451`	`+ return LONG2NUM(rb_enc_strlen(S_PBEG(p), CURPTR(p), rb_enc_get(p->str)));`
`455`	`452`	`}`
`456`	`453`
`457`	`454`	`/*`