diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-15 03:00:31 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-15 03:00:31 +0000 |
commit | 1a60f3b6f18ee2d6381ea26dbab8784cd690046e (patch) | |
tree | 7c29b8c910bf8d7a01dd2fef6b6ae2e8c0886201 /dir.c | |
parent | 19b4603dec3713227a02aff315757fa64e111ad8 (diff) | |
download | ruby-1a60f3b6f18ee2d6381ea26dbab8784cd690046e.tar.gz ruby-1a60f3b6f18ee2d6381ea26dbab8784cd690046e.tar.xz ruby-1a60f3b6f18ee2d6381ea26dbab8784cd690046e.zip |
* dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
fail if bytes are invalid. [ruby-dev:38307]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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; |