diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | re.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 9 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Dec 29 18:58:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * re.c (unescape_nonascii): append excape sequence as-is not + unescaped character, to get rid of unexpected meta-character. + [ruby-core:67193] [Bug #10670] + Mon Dec 29 14:27:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * doc/syntax/literals.rdoc (Symbols): now Symbols created by @@ -2298,9 +2298,10 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc, case 'M': /* \M-X, \M-\C-X, \M-\cX */ p = p-2; if (enc == rb_usascii_encoding()) { + const char *pbeg = p; c = read_escaped_byte(&p, end, err); if (c == (char)-1) return -1; - rb_str_buf_cat(buf, &c, 1); + rb_str_buf_cat(buf, pbeg, p-pbeg); } else { if (unescape_escaped_nonascii(&p, end, enc, buf, encp, err) != 0) diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 99450723cf..99a6b3130f 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1579,4 +1579,13 @@ class TestM17N < Test::Unit::TestCase assert_same(str, str.scrub!) assert_equal("\uFFFD\uFFFD\uFFFD", str) end + + def test_escaped_metachar + bug10670 = '[ruby-core:67193] [Bug #10670]' + + escape_plain = /\A[\x5B]*\z/.freeze + + assert_match(escape_plain, 0x5b.chr(::Encoding::UTF_8), bug10670) + assert_match(escape_plain, 0x5b.chr, bug10670) + end end |