archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r23190 from trunk into ruby_1_9_1.

Browse source 
--
* dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
  fail if bytes are invalid. [ruby-dev:38307]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-05-04 12:30:33 +00:00
parent 70f1666743
commit 5e263fa0c0
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Apr 15 11:53:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
* dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
fail if bytes are invalid. [ruby-dev:38307]
Tue Apr 14 18:11:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (bracket): if same in bytes, path is matching.

4
dir.c
View file

@ -224,7 +224,9 @@ fnmatch_helper(
RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
if (ISEND(p))
goto failed;
r = rb_enc_mbclen(p, pend, enc);
r = rb_enc_precise_mbclen(p, pend, enc);
if (!MBCLEN_CHARFOUND_P(r))
goto failed;
if (r <= (send-s) && memcmp(p, s, r) == 0) {
p += r;
s += r;