public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: fnmatch: fix range comparison in C locale Date: Thu, 27 Jul 2023 19:58:05 +0000 (GMT) [thread overview] Message-ID: <20230727195805.053743858D39@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a13b0b7aea9d12c6cefe21082ef5c921ac071e3a commit a13b0b7aea9d12c6cefe21082ef5c921ac071e3a Author: Corinna Vinschen <corinna@vinschen.de> AuthorDate: Thu Jul 27 21:57:49 2023 +0200 Commit: Corinna Vinschen <corinna@vinschen.de> CommitDate: Thu Jul 27 21:57:49 2023 +0200 Cygwin: fnmatch: fix range comparison in C locale Commit c36064bbd0c5 introduced operating on character pointers instead of operating on characters, to allow collating symbols. This patch neglected to change the expression for range comparison in case we're in the C locale. Thus it suddenly compared pointers instead of characters. Fix that. Fixes: c36064bbd0c5 ("Cygwin: fnmatch: support collating symbols in [. .] brackets") Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- winsup/cygwin/libc/fnmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winsup/cygwin/libc/fnmatch.c b/winsup/cygwin/libc/fnmatch.c index 8a229a142032..a1cb5d1e4616 100644 --- a/winsup/cygwin/libc/fnmatch.c +++ b/winsup/cygwin/libc/fnmatch.c @@ -353,7 +353,7 @@ rangematch(const wint_t *pattern, wint_t *test, int flags, wint_t **newp, } if ((!__get_current_collate_locale ()->win_locale[0]) ? - c <= test && test <= c2 : + *c <= *test && *test <= *c2 : __wscollate_range_cmp(c, test, clen, tlen) <= 0 && __wscollate_range_cmp(test, c2, tlen, c2len) <= 0 )
reply other threads:[~2023-07-27 19:58 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230727195805.053743858D39@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).