diff options
| -rw-r--r-- | dir.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_dir_m17n.rb | 10 |
2 files changed, 13 insertions, 3 deletions
@@ -1205,9 +1205,9 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc) return MAGICAL; case '\\': - if (escape && !(c = *p++)) - return PLAIN; - continue; + if (escape && p++ >= pend) + continue; + break; #ifdef _WIN32 case '~': diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index a72598b360..04186e54a7 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -352,6 +352,16 @@ class TestDir_M17N < Test::Unit::TestCase end end + def test_glob_escape_multibyte + name = "\x81\\".force_encoding(Encoding::Shift_JIS) + with_tmpdir do + open(name, "w") {} rescue next + match, = Dir.glob("#{name}*") + next unless match and match.encoding == Encoding::Shift_JIS + assert_equal([name], Dir.glob("\\#{name}*")) + end + end + def test_entries_compose bug7267 = '[ruby-core:48745] [Bug #7267]' |