Commit Diff

Commit:
fa09883c72855768a0f827a330097bf3dc5c839e
From:
Florian Westphal <fw@strlen.de>
Date:
Message:
fix assertion failure in ng_ipaddr.c when building with debugging enabled, but without ipv6 support, ngircd dumped core when loading a config file that specified an ipv6 listen address. ngircd: ng_ipaddr.c:45: ng_ipaddr_init: Assertion `sizeof(*addr) >= res0->ai_addrlen' failed.
Actions:
Patch | Tree
commit - affa03b277bb479c050f2d6967ae410e49e0d2ac
commit + fa09883c72855768a0f827a330097bf3dc5c839e
blob - 4f1d4ca40492562858e87357c107c320b85c48b2
blob + af524d091fa569dd874559a3f032f5dcc0cfde6d
--- src/ipaddr/ng_ipaddr.c
+++ src/ipaddr/ng_ipaddr.c
@@ -30,6 +30,9 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, 
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_NUMERICHOST;
+#ifndef WANT_IPV6	/* do not convert ipv6 addresses */
+	hints.ai_family = AF_INET;
+#endif
 
 	/* some getaddrinfo implementations require that ai_socktype is set. */
 	hints.ai_socktype = SOCK_STREAM;
@@ -38,7 +41,6 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, 
 	snprintf(portstr, sizeof(portstr), "%u", (unsigned int) port);
 
 	ret = getaddrinfo(ip_str, portstr, &hints, &res0);
-	assert(ret == 0);
 	if (ret != 0)
 		return false;