always cast is*() arguments to unsigned char

backport of 6130e0e and 06035a0

4 files changed, 15 insertions, 12 deletions

diff --git a/gg.c b/gg.c
index cd335b4..c12729b 100644
--- a/gg.c
+++ b/gg.c
@@ -248,7 +248,9 @@ get(const char *r)
 
 		if (memmem(buf, len, "\r\n", 2) == NULL)
 			errx(1, "invalid reply: no \\r\\n");
-		if (!isdigit(buf[0]) || !isdigit(buf[1]) || buf[2] != ' ')
+		if (!isdigit((unsigned char)buf[0]) ||
+		    !isdigit((unsigned char)buf[1]) ||
+		    buf[2] != ' ')
 			errx(1, "invalid reply: invalid response format");
 
 		code = (buf[0] - '0') * 10 + buf[1] - '0';
diff --git a/iri.c b/iri.c
index 8725cdd..7414f02 100644
--- a/iri.c
+++ b/iri.c
@@ -22,7 +22,7 @@
 static inline int
 unreserved(int p)
 {
-	return isalnum(p)
+	return isalnum((unsigned char)p)
 		|| p == '-'
 		|| p == '.'
 		|| p == '_'
@@ -51,7 +51,8 @@ valid_pct_enc_string(char *s)
 	if (*s != '%')
 		return 1;
 
-	if (!isxdigit(s[1]) || !isxdigit(s[2]))
+	if (!isxdigit((unsigned char)s[1]) ||
+	    !isxdigit((unsigned char)s[2]))
 		return 0;
 
 	if (s[1] == '0' && s[2] == '0')
@@ -108,7 +109,7 @@ parse_scheme(struct parser *p)
 {
 	p->parsed->schema = p->iri;
 
-	if (!isalpha(*p->iri)) {
+	if (!isalpha((unsigned char)*p->iri)) {
 		p->err = "illegal character in scheme";
 		return 0;
 	}
@@ -125,7 +126,7 @@ parse_scheme(struct parser *p)
 		 */
 		*p->iri = tolower(*p->iri);
 		p->iri++;
-	} while (isalnum(*p->iri)
+	} while (isalnum((unsigned char)*p->iri)
 	    || *p->iri == '+'
 	    || *p->iri == '-'
 	    || *p->iri == '.');
@@ -153,7 +154,7 @@ parse_port(struct parser *p)
 
 	p->parsed->port = p->iri;
 
-	for (; isdigit(*p->iri); p->iri++) {
+	for (; isdigit((unsigned char)*p->iri); p->iri++) {
 		i = i * 10 + *p->iri - '0';
 		if (i > UINT16_MAX) {
 			p->err = "port number too large";
diff --git a/proxy.c b/proxy.c
index 532517b..5c6a914 100644
--- a/proxy.c
+++ b/proxy.c
@@ -160,9 +160,9 @@ proxy_read(struct bufferevent *bev, void *d)
 		}
 
 		if (len < 3 || len > 1029 ||
-		    !isdigit(hdr[0]) ||
-		    !isdigit(hdr[1]) ||
-		    !isspace(hdr[2])) {
+		    !isdigit((unsigned char)hdr[0]) ||
+		    !isdigit((unsigned char)hdr[1]) ||
+		    !isspace((unsigned char)hdr[2])) {
 			free(hdr);
 			log_warn(c, "upstream server is trying to send a "
 			    "header that's too long.");
diff --git a/server.c b/server.c
index 2258e67..d29658c 100644
--- a/server.c
+++ b/server.c
@@ -1334,9 +1334,9 @@ cgi_read(struct bufferevent *bev, void *d)
 		}
 
 		if (len < 3 || len > 1029 ||
-		    !isdigit(header[0]) ||
-		    !isdigit(header[1]) ||
-		    !isspace(header[2])) {
+		    !isdigit((unsigned char)header[0]) ||
+		    !isdigit((unsigned char)header[1]) ||
+		    !isspace((unsigned char)header[2])) {
 			free(header);
 			log_warn(client, "CGI script is trying to send a "
 			    "malformed header");