Fix gcc-15 caveat: {0} initializer in C or C++ for unions no longer guarantees clearing of the whole union (except for static storage duration initialization), it just initializes the first union member to zero.

Signed-off-by: Dominik <[email protected]>

Author: DL6ER

src/dnsmasq_interface.c

@@ -97,10 +97,10 @@ static struct {
 	char name[IFNAMSIZ];
 	union all_addr addr4;
 	union all_addr addr6;
-} next_iface = {false, false, "", {{ 0 }}, {{ 0 }}};
+} next_iface = {false, false, "", {}, {}};
 
 // Fork-private copy of the server data the most recent reply came from
-static union mysockaddr last_server = {{ 0 }};
+static union mysockaddr last_server = {};
 
 const char *flagnames[] = {"F_IMMORTAL ", "F_NAMEP ", "F_REVERSE ", "F_FORWARD ", "F_DHCP ", "F_NEG ", "F_HOSTS ", "F_IPV4 ", "F_IPV6 ", "F_BIGNAME ", "F_NXDOMAIN ", "F_CNAME ", "F_DNSKEY ", "F_CONFIG ", "F_DS ", "F_DNSSECOK ", "F_UPSTREAM ", "F_RRNAME ", "F_SERVER ", "F_QUERY ", "F_NOERR ", "F_AUTH ", "F_DNSSEC ", "F_KEYTAG ", "F_SECSTAT ", "F_NO_RR ", "F_IPSET ", "F_NOEXTRA ", "F_DOMAINSRV", "F_RCODE", "F_RR", "F_STALE" };
 
@@ -296,7 +296,7 @@ size_t _FTL_make_answer(struct dns_header *header, char *limit, const size_t len
 
 	// Check for regex redirecting
 	bool redirecting = false;
-	union all_addr redirect_addr4 = {{ 0 }}, redirect_addr6 = {{ 0 }};
+	union all_addr redirect_addr4 = {}, redirect_addr6 = {};
 	if(last_regex_idx > -1)
 	{
 		redirecting = regex_get_redirect(last_regex_idx, &redirect_addr4.addr4, &redirect_addr6.addr6);
@@ -463,7 +463,7 @@ size_t _FTL_make_answer(struct dns_header *header, char *limit, const size_t len
 	// Add A answer record if requested
 	if(flags & F_IPV4)
 	{
-		union all_addr addr = {{ 0 }};
+		union all_addr addr = {};
 
 		// Overwrite with IP address if requested
 		if(redirecting)
@@ -511,7 +511,7 @@ size_t _FTL_make_answer(struct dns_header *header, char *limit, const size_t len
 	// Add AAAA answer record if requested
 	if(flags & F_IPV6)
 	{
-		union all_addr addr = {{ 0 }};
+		union all_addr addr = {};
 
 		// Overwrite with IP address if requested
 		if(redirecting)
@@ -561,7 +561,7 @@ size_t _FTL_make_answer(struct dns_header *header, char *limit, const size_t len
 		if(flags == 0)
 		{
 			// REFUSED
-			union all_addr addr = {{ 0 }};
+			union all_addr addr = {};
 			addr.log.rcode = REFUSED;
 			addr.log.ede = EDE_BLOCKED;
 			log_query(F_RCODE | F_HOSTS, name, &addr, (char*)blockingreason, 0);
@@ -1214,7 +1214,7 @@ static void check_pihole_PTR(char *domain)
 	}
 
 	// Convert PTR request into numeric form
-	union all_addr addr = {{ 0 }};
+	union all_addr addr = {};
 	const int flags = in_arpa_name_2_addr(domain, &addr);
 
 	// Check if this is a valid in-addr.arpa (IPv4) or ip6.[int|arpa] (IPv6)
@@ -3662,11 +3662,11 @@ void FTL_TCP_worker_created(const int confd)
 	{
 		// Get peer IP address (client)
 		char peer_ip[ADDRSTRLEN] = { 0 };
-		union mysockaddr peer_sockaddr = {{ 0 }};
+		union mysockaddr peer_sockaddr = {};
 		socklen_t peer_len = sizeof(union mysockaddr);
 		if (getpeername(confd, (struct sockaddr *)&peer_sockaddr, &peer_len) != -1)
 		{
-			union all_addr peer_addr = {{ 0 }};
+			union all_addr peer_addr = {};
 			if (peer_sockaddr.sa.sa_family == AF_INET6)
 				peer_addr.addr6 = peer_sockaddr.in6.sin6_addr;
 			else
@@ -3676,11 +3676,11 @@ void FTL_TCP_worker_created(const int confd)
 
 		// Get local IP address (interface)
 		char local_ip[ADDRSTRLEN] = { 0 };
-		union mysockaddr iface_sockaddr = {{ 0 }};
+		union mysockaddr iface_sockaddr = {};
 		socklen_t iface_len = sizeof(union mysockaddr);
 		if(getsockname(confd, (struct sockaddr *)&iface_sockaddr, &iface_len) != -1)
 		{
-			union all_addr iface_addr = {{ 0 }};
+			union all_addr iface_addr = {};
 			if (iface_sockaddr.sa.sa_family == AF_INET6)
 				iface_addr.addr6 = iface_sockaddr.in6.sin6_addr;
 			else

src/edns0.c

@@ -222,7 +222,7 @@ void FTL_parse_pseudoheaders(unsigned char *pheader, const size_t plen)
 			//      +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
 			//   8: |                           ADDRESS...                          /
 			//      +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-			union all_addr addr = {{ 0 }};
+			union all_addr addr = {};
 			const size_t addrlen = optlen - 4;
 			if(family == 1 && addrlen <= sizeof(addr.addr4.s_addr)) // IPv4
 				memcpy(&addr.addr4.s_addr, p, addrlen);

src/regex.c

@@ -372,7 +372,7 @@ static int match_regex(const char *input, DNSCacheData *dns_cache, const int cli
 {
 	int match_idx = -1;
 #ifdef USE_TRE_REGEX
-	regmatch_t match[1] = {{ 0 }}; // This also disables any sub-matching
+	regmatch_t match[1] = {}; // This also disables any sub-matching
 #endif
 
 	// Check if we need to recompile regex because they were changed in