From e05576607ffb03796ec2f3672a3c264b17418dfc Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 28 Mar 2012 13:07:54 -0400 Subject: [PATCH] cast ctype(3) function/macro arguments from char to unsigned char to avoid potential negative subscripting. --- compat/fnmatch.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/compat/fnmatch.c b/compat/fnmatch.c index 1daaba2d0..54a314213 100644 --- a/compat/fnmatch.c +++ b/compat/fnmatch.c @@ -208,10 +208,11 @@ leadingclosebrace: /* XXX: handle locale/MBCS comparison, advance by MBCS char width */ if ((**string >= *startch) && (**string <= **pattern)) result = 0; - else if (nocase && (isupper(**string) || isupper(*startch) - || isupper(**pattern)) - && (tolower(**string) >= tolower(*startch)) - && (tolower(**string) <= tolower(**pattern))) + else if (nocase && (isupper((unsigned char)**string) || + isupper((unsigned char)*startch) || + isupper((unsigned char)**pattern)) + && (tolower((unsigned char)**string) >= tolower((unsigned char)*startch)) + && (tolower((unsigned char)**string) <= tolower((unsigned char)**pattern))) result = 0; ++*pattern; @@ -221,8 +222,9 @@ leadingclosebrace: /* XXX: handle locale/MBCS comparison, advance by MBCS char width */ if ((**string == **pattern)) result = 0; - else if (nocase && (isupper(**string) || isupper(**pattern)) - && (tolower(**string) == tolower(**pattern))) + else if (nocase && (isupper((unsigned char)**string) || + isupper((unsigned char)**pattern)) + && (tolower((unsigned char)**string) == tolower((unsigned char)**pattern))) result = 0; ++*pattern; @@ -248,8 +250,8 @@ leadingclosebrace: /* XXX: handle locale/MBCS comparison, advance by the MBCS char width */ if (**string == **pattern) result = 0; - else if (nocase && (isupper(**string) || isupper(**pattern)) - && (tolower(**string) == tolower(**pattern))) + else if (nocase && (isupper((unsigned char)**string) || isupper((unsigned char)**pattern)) + && (tolower((unsigned char)**string) == tolower((unsigned char)**pattern))) result = 0; /* Refuse to advance over trailing slash or nulls -- 2.50.1