From e39685b5790e3d328b80a57572bbfab9dfbeda09 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 2 Jun 2020 20:32:21 +0200
Subject: [PATCH] Fix "array subscript is of type 'char'"

---
 bin/named/main.c    | 7 ++++---
 lib/isccfg/parser.c | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/named/main.c b/bin/named/main.c
index 50345be562..13f0aeb6c7 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -355,11 +355,12 @@ save_command_line(int argc, char *argv[]) {
 		*dst++ = ' ';
 
 		while (*src != '\0' && dst < eob) {
-			if (isalnum(*src) || *src == ',' || *src == '-' ||
-			    *src == '_' || *src == '.' || *src == '/')
+			if (isalnum(*(unsigned char *)src) || *src == ',' ||
+			    *src == '-' || *src == '_' || *src == '.' ||
+			    *src == '/')
 			{
 				*dst++ = *src++;
-			} else if (isprint(*src)) {
+			} else if (isprint(*(unsigned char *)src)) {
 				if (dst + 2 >= eob) {
 					goto add_ellipsis;
 				}
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 145a0f2036..a8f73711cf 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1283,7 +1283,7 @@ parse_duration(cfg_parser_t *pctx, cfg_obj_t **ret) {
 
 	duration.unlimited = false;
 
-	if (toupper(TOKEN_STRING(pctx)[0]) == 'P') {
+	if (toupper((unsigned char)TOKEN_STRING(pctx)[0]) == 'P') {
 		result = duration_fromtext(&pctx->token.value.as_textregion,
 					   &duration);
 		duration.iso8601 = true;