summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-10-19 12:11:48 +0200
committerThomas Haller <thaller@redhat.com>2018-10-27 22:03:01 +0200
commit2dddf5924a892b2b4fe61f054ce93211ec673bfd (patch)
tree2e9e62b44aa49a01420258747f7da90c7d7ca19c
parentd49a036afe7e9561461b582b80c05d8150fe9015 (diff)
downloadNetworkManager-2dddf5924a892b2b4fe61f054ce93211ec673bfd.tar.gz
dhcp6: split assert_return() to be more debuggable when hit
(cherry picked from commit 3c290c03167cf9334cb419035587ff3057940eee)
-rw-r--r--src/systemd/src/libsystemd-network/dhcp6-option.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
index 900a2386f1..c4b4b08be6 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
@@ -88,7 +88,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: