From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 19 Oct 2018 10:11:48 +0000 (+0200)
Subject: dhcp6: split assert_return() to be more debuggable when hit
X-Git-Tag: v240~474^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c290c03167cf9334cb419035587ff3057940eee;p=thirdparty%2Fsystemd.git

dhcp6: split assert_return() to be more debuggable when hit
---

diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index 321d0d21dfa..a4278528ab2 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -86,7 +86,10 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
         DHCP6Address *addr;
         int r;
 
-        assert_return(buf && *buf && buflen && ia, -EINVAL);
+        assert_return(buf, -EINVAL);
+        assert_return(*buf, -EINVAL);
+        assert_return(buflen, -EINVAL);
+        assert_return(ia, -EINVAL);
 
         switch (ia->type) {
         case SD_DHCP6_OPTION_IA_NA: