From: Tom Gundersen <teg@jklm.no>
Date: Wed, 18 Dec 2013 09:52:22 +0000 (+0100)
Subject: libsystemd-dhcp: add some asserts
X-Git-Tag: v209~721
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=23f30ed31218c6bc01d9a0ecebdace43e67e97ff;hp=3dd714003534ab1588203f854ac4cb1a7a233262

libsystemd-dhcp: add some asserts
---

diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd-dhcp/dhcp-client.c
index a8b9354d6..68a732834 100644
--- a/src/libsystemd-dhcp/dhcp-client.c
+++ b/src/libsystemd-dhcp/dhcp-client.c
@@ -1061,7 +1061,7 @@ int sd_dhcp_client_start(sd_dhcp_client *client)
         int r;
 
         assert_return(client, -EINVAL);
-        assert_return(client->index >= 0, -EINVAL);
+        assert_return(client->index > 0, -EINVAL);
         assert_return(client->state == DHCP_STATE_INIT ||
                       client->state == DHCP_STATE_INIT_REBOOT, -EBUSY);
 
diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd-dhcp/dhcp-network.c
index ce27f425c..b2de67e8a 100644
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd-dhcp/dhcp-network.c
@@ -34,6 +34,9 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
 {
         int s;
 
+        assert(index > 0);
+        assert(link);
+
         s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
                    htons(ETH_P_IP));
         if (s < 0)
@@ -77,6 +80,10 @@ int dhcp_network_bind_udp_socket(int index, be32_t client_address)
 int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
                                  const void *packet, size_t len)
 {
+        assert(link);
+        assert(packet);
+        assert(len);
+
         if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
                 return -errno;