From: Roy Marples <roy@marples.name>
Date: Tue, 6 Sep 2016 14:58:33 +0000 (+0000)
Subject: Don't dispatch 0 bytes.
X-Git-Tag: v6.11.4~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c74cceb9bdcfd79534d925c6d6e422f36124765;p=thirdparty%2Fdhcpcd.git

Don't dispatch 0 bytes.
---

diff --git a/if-bsd.c b/if-bsd.c
index f2cee0e7..c8ed3029 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -1530,15 +1530,16 @@ int
 if_handlelink(struct dhcpcd_ctx *ctx)
 {
 	struct msghdr msg;
-	ssize_t bytes;
+	ssize_t len;
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_iov = ctx->iov;
 	msg.msg_iovlen = 1;
 
-	if ((bytes = recvmsg_realloc(ctx->link_fd, &msg, 0)) == -1)
+	if ((len = recvmsg_realloc(ctx->link_fd, &msg, 0)) == -1)
 		return -1;
-	if_dispatch(ctx, ctx->iov[0].iov_base);
+	if (len != 0)
+		if_dispatch(ctx, ctx->iov[0].iov_base);
 	return 0;
 }
 
diff --git a/if-sun.c b/if-sun.c
index 50897b28..6d8e2b69 100644
--- a/if-sun.c
+++ b/if-sun.c
@@ -770,15 +770,16 @@ int
 if_handlelink(struct dhcpcd_ctx *ctx)
 {
 	struct msghdr msg;
-	ssize_t bytes;
+	ssize_t len;
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_iov = ctx->iov;
 	msg.msg_iovlen = 1;
 
-	if ((bytes = recvmsg_realloc(ctx->link_fd, &msg, 0)) == -1)
+	if ((len = recvmsg_realloc(ctx->link_fd, &msg, 0)) == -1)
 		return -1;
-	if_dispatch(ctx, ctx->iov[0].iov_base);
+	if (len != 0)
+		if_dispatch(ctx, ctx->iov[0].iov_base);
 	return 0;
 }