From 1a60f3b6f18ee2d6381ea26dbab8784cd690046e Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Apr 2009 03:00:31 +0000
Subject: * 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
---
 dir.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dir.c')

diff --git a/dir.c b/dir.c
index 522818b66..be642d38e 100644
--- a/dir.c
+++ b/dir.c
@@ -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;
-- 
cgit