From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 9 Dec 2020 10:43:16 +0000 (+0100)
Subject: Use calloc and freeaddrinfo
X-Git-Tag: release-1.13.2rc1~254^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9272725cddf400ed7dff10c48d2aaf3fc760393b;p=thirdparty%2Funbound.git

Use calloc and freeaddrinfo
---

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 823d56fd3..3de8c5fe4 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1171,7 +1171,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		return 0;
 
 	if(do_auto) {
-		ub_sock = malloc(sizeof(struct unbound_socket));
+		ub_sock = calloc(1, sizeof(struct unbound_socket));
 		if(!ub_sock)
 			return 0;
 		if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1, 
@@ -1194,7 +1194,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			return 0;
 		}
 	} else if(do_udp) {
-		ub_sock = malloc(sizeof(struct unbound_socket));
+		ub_sock = calloc(1, sizeof(struct unbound_socket));
 		if(!ub_sock)
 			return 0;
 		/* regular udp socket */
@@ -1217,7 +1217,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		int is_ssl = if_is_ssl(ifname, port, ssl_port,
 			tls_additional_port);
 		enum listen_type port_type;
-		ub_sock = malloc(sizeof(struct unbound_socket));
+		ub_sock = calloc(1, sizeof(struct unbound_socket));
 		if(!ub_sock)
 			return 0;
 		if(is_ssl)
@@ -1694,7 +1694,7 @@ void listening_ports_free(struct listen_port* list)
 		if(list->fd != -1) {
 			sock_close(list->fd);
 		}
-		free(list->socket->addr);
+		freeaddrinfo(list->socket->addr);
 		free(list->socket);
 		free(list);
 		list = nx;