diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 12 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Mar 21 16:48:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (simple_re_meta): escape all closing characters, not only + round parenthesis. [ruby-core:53578] [Bug #8133] + Thu Mar 21 13:50:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_core.h (UNINITIALIZED_VAR): suppress warnings by clang 4.2. @@ -5994,7 +5994,7 @@ simple_re_meta(int c) switch (c) { case '$': case '*': case '+': case '.': case '?': case '^': case '|': - case ')': + case ')': case ']': case '}': case '>': return TRUE; default: return FALSE; diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 308b30ae9c..46fd4531a0 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -180,9 +180,15 @@ class TestRegexp < Test::Unit::TestCase end def test_source_escaped_paren - bug7610 = '[ruby-core:51088]' - s = '\(a\)' - assert_equal(/#{s}/, eval("%r(#{s})"), bug7610) + bug7610 = '[ruby-core:51088] [Bug #7610]' + bug8133 = '[ruby-core:53578] [Bug #8133]' + [ + ["(", ")", bug7610], ["[", "]", bug8133], + ["{", "}", bug8133], ["<", ">", bug8133], + ].each do |lparen, rparen, bug| + s = "\\#{lparen}a\\#{rparen}" + assert_equal(/#{s}/, eval("%r#{lparen}#{s}#{rparen}"), bug) + end end def test_source_unescaped |