From e240c3407218a5eaaab98fc14d26588c150a33dd Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 14 May 2011 11:15:55 +0000 Subject: Fix another edge case, in [x-/] processing, which I can't seem to compose the proper test-case to expose. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1103041 13f79535-47bb-0310-9956-ffa450edef68 --- strings/apr_fnmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strings') diff --git a/strings/apr_fnmatch.c b/strings/apr_fnmatch.c index 2530dabb1..c3eea03d9 100644 --- a/strings/apr_fnmatch.c +++ b/strings/apr_fnmatch.c @@ -121,7 +121,7 @@ leadingclosebrace: */ /* XXX: Fix for locale/MBCS character width */ if (((*pattern)[1] == '-') && (*pattern)[2] - && ((escape && ((*pattern)[2] != '\\')) + && (!(escape && ((*pattern)[2] == '\\')) ? (((*pattern)[2] != ']') && (!slash || ((*pattern)[2] != '/'))) : (((*pattern)[3]) && (!slash || ((*pattern)[3] != '/'))))) { startch = *pattern; -- cgit v1.2.1