From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 22 Mar 2021 14:02:19 +0000 (+0100)
Subject: - Fix compile error in listen_dnsport on Android.
X-Git-Tag: release-1.13.2rc1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=574c1fa50a981fd82af75cc7cb22533c162e2b3e;p=thirdparty%2Funbound.git

- Fix compile error in listen_dnsport on Android.
---

diff --git a/doc/Changelog b/doc/Changelog
index 71d4d7839..bc2ec6e72 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	- Merge #449 from orbea: build: Add missing linker flags.
 	- iana portlist update.
 	- Comment out nonworking OSX and IOS travis tests, vm fails to start.
+	- Fix compile error in listen_dnsport on Android.
 
 19 March 2021: Wouter
 	- Fix for #447: squelch connection refused tcp connection failures
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index b8c04a3ec..b22beab6e 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1579,7 +1579,7 @@ int resolve_interface_names(char** ifs, int num_ifs,
 	}
 	*num_resif = num_ifs;
 	for(p = list; p; p = p->next) {
-		*num_resif ++;
+		(*num_resif)++;
 	}
 	*resif = calloc(*num_resif, sizeof(**resif));
 	if(!*resif) {
@@ -1600,15 +1600,17 @@ int resolve_interface_names(char** ifs, int num_ifs,
 		}
 	}
 	if(list) {
+		int idx = num_ifs;
 		for(p = list; p; p = p->next) {
-			(*resif)[i] = strdup(p->str);
-			if(!((*resif)[i])) {
+			(*resif)[idx] = strdup(p->str);
+			if(!((*resif)[idx])) {
 				log_err("out of memory");
 				config_del_strarray(*resif, *num_resif);
 				*resif = NULL;
 				*num_resif = 0;
 				return 0;
 			}
+			idx++;
 		}
 	}
 	return 1;