summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--re.c5
-rw-r--r--test/ruby/test_regexp.rb13
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 81011fa0d61..0da44ec1029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 21 19:51:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * re.c (match_aref): RMatch::regexp is Qnil after matching by a
+ string since r45451. [ruby-core:68209] [Bug #10877]
+
Sat Feb 21 16:18:42 2015 Stefan Schuler <mail@stefanschuessler.de>
* compar.c (Init_Comparable): [DOC] Replace camelcase variable name.
diff --git a/re.c b/re.c
index 1f88d6053c0..7e789f56dfc 100644
--- a/re.c
+++ b/re.c
@@ -1787,7 +1787,7 @@ name_to_backref_error(VALUE name)
static VALUE
match_aref(int argc, VALUE *argv, VALUE match)
{
- VALUE idx, rest;
+ VALUE idx, rest, re;
match_check(match);
rb_scan_args(argc, argv, "11", &idx, &rest);
@@ -1808,7 +1808,8 @@ match_aref(int argc, VALUE *argv, VALUE match)
/* fall through */
case T_STRING:
p = StringValuePtr(idx);
- if (!rb_enc_compatible(RREGEXP(RMATCH(match)->regexp)->src, idx) ||
+ re = RMATCH(match)->regexp;
+ if (NIL_P(re) || !rb_enc_compatible(RREGEXP(re)->src, idx) ||
(num = name_to_backref_number(RMATCH_REGS(match), RMATCH(match)->regexp,
p, p + RSTRING_LEN(idx))) < 1) {
name_to_backref_error(idx);
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index e16075ad38f..cef21b99aa0 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -545,6 +545,19 @@ class TestRegexp < Test::Unit::TestCase
assert_equal("foo", $&)
end
+ def test_match_without_regexp
+ bug10877 = '[ruby-core:68209] [Bug #10877]'
+ "abc".sub("a", "")
+ assert_raise_with_message(IndexError, /foo/, bug10877) {$~["foo"]}
+ key = "\u{3042}"
+ [Encoding::UTF_8, Encoding::Shift_JIS, Encoding::EUC_JP].each do |enc|
+ idx = key.encode(enc)
+ EnvUtil.with_default_external(enc) do
+ assert_raise_with_message(IndexError, /#{idx}/, bug10877) {$~[idx]}
+ end
+ end
+ end
+
def test_last_match
/(...)(...)(...)(...)?/.match("foobarbaz")
assert_equal("foobarbaz", Regexp.last_match(0))