From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri, 21 Oct 2016 13:38:02 +0000 (+0200)
Subject: daemon: nitpicks about the parent commit
X-Git-Tag: v1.2.0-rc1~92^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f072ef3bc95af9635b0ef6d5f298359859c14bed;p=thirdparty%2Fknot-resolver.git

daemon: nitpicks about the parent commit
---

diff --git a/daemon/engine.c b/daemon/engine.c
index 54fdf2a0e..a1d26f578 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -369,7 +369,7 @@ static int l_map(lua_State *L)
 		/* Read response */
 		uint32_t rlen = 0;
 		if (read(fd, &rlen, sizeof(rlen)) == sizeof(rlen)) {
-			expr_checked(rlen < UINT_MAX);
+			expr_checked(rlen < UINT32_MAX);
 			auto_free char *rbuf = malloc(rlen + 1);
 			expr_checked(rbuf != NULL);
 			expr_checked(read(fd, rbuf, rlen) == rlen);
diff --git a/daemon/network.c b/daemon/network.c
index 5ae9a7f56..db04fedff 100644
--- a/daemon/network.c
+++ b/daemon/network.c
@@ -143,7 +143,7 @@ static int open_endpoint(struct network *net, struct endpoint *ep, struct sockad
 			return kr_error(ENOMEM);
 		}
 		memset(ep->udp, 0, sizeof(*ep->udp));
-		handle_init(udp, net->loop, ep->udp, sa->sa_family);
+		handle_init(udp, net->loop, ep->udp, sa->sa_family); /* can return! */
 		ret = udp_bind(ep->udp, sa);
 		if (ret != 0) {
 			return ret;
@@ -156,7 +156,7 @@ static int open_endpoint(struct network *net, struct endpoint *ep, struct sockad
 			return kr_error(ENOMEM);
 		}
 		memset(ep->tcp, 0, sizeof(*ep->tcp));
-		handle_init(tcp, net->loop, ep->tcp, sa->sa_family);
+		handle_init(tcp, net->loop, ep->tcp, sa->sa_family); /* can return! */
 		if (flags & NET_TLS) {
 			ret = tcp_bind_tls(ep->tcp, sa);
 			ep->flags |= NET_TLS;