1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re.c: char boundary

Browse Source 
* re.c (rb_reg_match_m_p): consider char boundary.  rb_str_subpos
  does not adjust to the boundary if len == 0.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-12 02:38:53 +00:00
parent 7e8b910a56
commit 2800e6a0a4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
re.c
View File

@ -3243,8 +3243,8 @@ rb_reg_match_m_p(int argc, VALUE *argv, VALUE re)
if (pos < 0) return Qfalse; if (pos < 0) return Qfalse;
} }
if (pos > 0) { if (pos > 0) {
long len = 0; long len = 1;
char *beg = rb_str_subpos(str, pos, &len); const char *beg = rb_str_subpos(str, pos, &len);
if (!beg) return Qfalse; if (!beg) return Qfalse;
pos = beg - RSTRING_PTR(str); pos = beg - RSTRING_PTR(str);
} }

3
test/ruby/test_regexp.rb
View File

@ -543,7 +543,8 @@ class TestRegexp < Test::Unit::TestCase
assert_equal(true, /../.match?('abc', -2)) assert_equal(true, /../.match?('abc', -2))
assert_equal(false, /../.match?("abc", -4)) assert_equal(false, /../.match?("abc", -4))
assert_equal(false, /../.match?("abc", 4)) assert_equal(false, /../.match?("abc", 4))
assert_equal(true, /../n.match?("\u3042" + '\x', 1)) assert_equal(true, /../.match?("\u3042xx", 1))
assert_equal(false, /../.match?("\u3042x", 1))
assert_equal(true, /\z/.match?("")) assert_equal(true, /\z/.match?(""))
assert_equal(true, /\z/.match?("abc")) assert_equal(true, /\z/.match?("abc"))
assert_equal(true, /R.../.match?("Ruby")) assert_equal(true, /R.../.match?("Ruby"))