- Fix compile error in listen_dnsport on Android.

This commit is contained in:
W.C.A. Wijngaards 2021-03-22 15:02:19 +01:00
parent ddb8b25800
commit 574c1fa50a
2 changed files with 6 additions and 3 deletions

View file

@ -5,6 +5,7 @@
- Merge #449 from orbea: build: Add missing linker flags. - Merge #449 from orbea: build: Add missing linker flags.
- iana portlist update. - iana portlist update.
- Comment out nonworking OSX and IOS travis tests, vm fails to start. - Comment out nonworking OSX and IOS travis tests, vm fails to start.
- Fix compile error in listen_dnsport on Android.
19 March 2021: Wouter 19 March 2021: Wouter
- Fix for #447: squelch connection refused tcp connection failures - Fix for #447: squelch connection refused tcp connection failures

View file

@ -1579,7 +1579,7 @@ int resolve_interface_names(char** ifs, int num_ifs,
} }
*num_resif = num_ifs; *num_resif = num_ifs;
for(p = list; p; p = p->next) { for(p = list; p; p = p->next) {
*num_resif ++; (*num_resif)++;
} }
*resif = calloc(*num_resif, sizeof(**resif)); *resif = calloc(*num_resif, sizeof(**resif));
if(!*resif) { if(!*resif) {
@ -1600,15 +1600,17 @@ int resolve_interface_names(char** ifs, int num_ifs,
} }
} }
if(list) { if(list) {
int idx = num_ifs;
for(p = list; p; p = p->next) { for(p = list; p; p = p->next) {
(*resif)[i] = strdup(p->str); (*resif)[idx] = strdup(p->str);
if(!((*resif)[i])) { if(!((*resif)[idx])) {
log_err("out of memory"); log_err("out of memory");
config_del_strarray(*resif, *num_resif); config_del_strarray(*resif, *num_resif);
*resif = NULL; *resif = NULL;
*num_resif = 0; *num_resif = 0;
return 0; return 0;
} }
idx++;
} }
} }
return 1; return 1;