summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2021-06-17 10:13:33 -0700
committerJeremy Evans <code@jeremyevans.net>2021-06-24 12:22:09 -0700
commita2592702ae4c18662a162805aa06d88046742f05 (patch)
treeda1580467b39ad5bc3f41fc68725571430748274 /dir.c
parent189f154786fd6392633fefd50bd76e9bdb401b52 (diff)
Actually ignore FNM_CASEFOLD flag in Dir.glob
This was already documented as being ignored, but it wasn't being ignored, causing an issue in a particular case where a UTF-8 pattern was provided and a filename was tested that wasn't valid UTF-8. Fixes [Bug #14456]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4583
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index d6a963f9d6..8ac10d2360 100644
--- a/dir.c
+++ b/dir.c
@@ -2955,7 +2955,7 @@ static VALUE
dir_s_glob(rb_execution_context_t *ec, VALUE obj, VALUE str, VALUE rflags, VALUE base, VALUE sort)
{
VALUE ary = rb_check_array_type(str);
- const int flags = NUM2INT(rflags) | dir_glob_option_sort(sort);
+ const int flags = (NUM2INT(rflags) | dir_glob_option_sort(sort)) & ~FNM_CASEFOLD;
base = dir_glob_option_base(base);
if (NIL_P(ary)) {
ary = rb_push_glob(str, base, flags);