diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-07 00:11:00 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-07 00:11:00 +0000 |
| commit | 461c38a9737edda4baf909ef3993b588150c97b2 (patch) | |
| tree | 2bffca9881fdb816b85de047bd1767b30345cbf2 | |
| parent | 6548425ee0339de8bab5e0124d0c3f57d517b953 (diff) | |
| download | ruby-461c38a9737edda4baf909ef3993b588150c97b2.tar.gz | |
dir.c: fix escaping multibyte char
* dir.c (has_magic): fix escaping multibyte char, with glob
meta-char in trailing bytes, e.g., Shift-JIS
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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]' |