diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-25 09:32:47 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-25 09:32:47 +0000 |
commit | a0b3e032020b77898cbc4be04559456a3cb6f10b (patch) | |
tree | 870ee7c127a2673b036e84cc42ef4a760ec80f0b | |
parent | 7b5a42f0fa54dbb0d381ffbe3b8de6601577c518 (diff) | |
download | ruby-a0b3e032020b77898cbc4be04559456a3cb6f10b.tar.gz |
* dir.c (bracket): fix copy-paste error. When the first and last
characters of fnmatch range have different length, fnmatch may
have wrongly matched a path that does not really match.
Coverity Scan found this bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | dir.c | 2 | ||||
-rw-r--r-- | test/ruby/test_fnmatch.rb | 5 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat May 25 18:08:06 2013 Yusuke Endoh <mame@tsg.ne.jp> + + * dir.c (bracket): fix copy-paste error. When the first and last + characters of fnmatch range have different length, fnmatch may + have wrongly matched a path that does not really match. + Coverity Scan found this bug. + Sat May 25 17:06:25 2013 Koichi Sasada <ko1@atdot.net> * gc.c (after_gc_sweep): reduce full GC timing. @@ -178,7 +178,7 @@ bracket( p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc)); if (ok) continue; if ((r <= (send-s) && memcmp(t1, s, r) == 0) || - (r2 <= (send-s) && memcmp(t2, s, r) == 0)) { + (r2 <= (send-s) && memcmp(t2, s, r2) == 0)) { ok = 1; continue; } diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb index 42f6a458f3..15e5d79e35 100644 --- a/test/ruby/test_fnmatch.rb +++ b/test/ruby/test_fnmatch.rb @@ -124,4 +124,9 @@ class TestFnmatch < Test::Unit::TestCase assert_file.fnmatch("{*,#{pattern_eucjp}}", path, File::FNM_EXTGLOB) end end + + def test_unicode + assert_file.fnmatch("[a-\u3042]*", "\u3042") + assert_file.not_fnmatch("[a-\u3042]*", "\u3043") + end end |