merge revision(s) 39413: [Backport #7911]

	* dir.c (file_s_fnmatch, fnmatch_brace): encoding-incompatible pattern
	  and string do not match, instead of exception.  [ruby-dev:47069]
	  [Bug #7911]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 2 deletions

diff --git a/dir.c b/dir.c
index 758a34eee6..27f16ebc4b 100644
--- a/dir.c
+++ b/dir.c
@@ -1919,7 +1919,24 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
     VALUE path = arg->value;
+    rb_encoding *enc_pattern = enc;
+    rb_encoding *enc_path = rb_enc_get(path);
 
+    if (enc_pattern != enc_path) {
+	if (!rb_enc_asciicompat(enc_pattern))
+	    return FNM_NOMATCH;
+	if (!rb_enc_asciicompat(enc_path))
+	    return FNM_NOMATCH;
+	if (!rb_enc_str_asciionly_p(path)) {
+	    int cr = ENC_CODERANGE_7BIT;
+	    long len = strlen(pattern);
+	    if (rb_str_coderange_scan_restartable(pattern, pattern + len,
+						  enc_pattern, &cr) != len)
+		return FNM_NOMATCH;
+	    if (cr != ENC_CODERANGE_7BIT)
+		return FNM_NOMATCH;
+	}
+    }
     return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
 }
 
@@ -2029,8 +2046,9 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
 	    return Qtrue;
     }
     else {
-	if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
-		    flags) == 0)
+	rb_encoding *enc = rb_enc_compatible(pattern, path);
+	if (!enc) return Qfalse;
+	if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
 	    return Qtrue;
     }
     RB_GC_GUARD(pattern);