From 3f9f973b14145f7eb8ce199c5b824d07c2acf615 Mon Sep 17 00:00:00 2001 From: guenther Date: Sun, 11 Oct 2015 03:23:28 +0000 Subject: [PATCH] The is*() interfaces expect EOF or an unsigned char; cast to (unsigned char) as required found by Michael McConville (mmcconv1 (at) sccs.swarthmore.edu) w/Coccinelle --- usr.sbin/ldapd/syntax.c | 4 ++-- usr.sbin/tcpdump/print-ipsec.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ldapd/syntax.c b/usr.sbin/ldapd/syntax.c index bfae26effc9..27f73527248 100644 --- a/usr.sbin/ldapd/syntax.c +++ b/usr.sbin/ldapd/syntax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syntax.c,v 1.2 2013/11/23 18:02:44 deraadt Exp $ */ +/* $OpenBSD: syntax.c,v 1.3 2015/10/11 03:23:28 guenther Exp $ */ /* * Copyright (c) 2010 Martin Hedenfalk @@ -142,7 +142,7 @@ syntax_is_printable_string(struct schema *schema, char *value, size_t len) char *p; for (p = value; len > 0 && *p != '\0'; p++, len--) { - if (!isalnum(*p) && strchr(special, *p) == NULL) + if (!isalnum((unsigned char)*p) && strchr(special, *p) == NULL) return 0; } diff --git a/usr.sbin/tcpdump/print-ipsec.c b/usr.sbin/tcpdump/print-ipsec.c index 829b3e21dd1..5ca7e6bd77c 100644 --- a/usr.sbin/tcpdump/print-ipsec.c +++ b/usr.sbin/tcpdump/print-ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ipsec.c,v 1.21 2015/03/29 14:09:29 bluhm Exp $ */ +/* $OpenBSD: print-ipsec.c,v 1.22 2015/10/11 03:23:28 guenther Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -101,7 +101,8 @@ esp_init (char *espspec) s[0] = espkey[2*i]; s[1] = espkey[2*i + 1]; s[2] = 0; - if (!isxdigit(s[0]) || !isxdigit(s[1])) { + if (!isxdigit((unsigned char)s[0]) || + !isxdigit((unsigned char)s[1])) { free(key); error("espkey must be specified in hex"); } -- 2.20.1