From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Wed, 10 Dec 2014 14:17:31 +0000 (+0200)
Subject: sd-dhcp6-lease: Return only -EINVAL when a NULL lease is supplied
X-Git-Tag: v218~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fab15fec2413bbc15dc7c24724ec82e371c966ba;p=elogind.git

sd-dhcp6-lease: Return only -EINVAL when a NULL lease is supplied

Suppyling a NULL lease is not a condition that needs to be asserted,
returning -EINVAL is informative enough to the caller. This simplifies
calling code and doesn't falsely indicate that something erroneous was
attempted.
---

diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c
index e2715ea65..8960fac92 100644
--- a/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/libsystemd-network/sd-dhcp6-lease.c
@@ -110,9 +110,11 @@ int dhcp6_lease_set_preference(sd_dhcp6_lease *lease, uint8_t preference) {
 }
 
 int dhcp6_lease_get_preference(sd_dhcp6_lease *lease, uint8_t *preference) {
-        assert_return(lease, -EINVAL);
         assert_return(preference, -EINVAL);
 
+        if (!lease)
+                return -EINVAL;
+
         *preference = lease->preference;
 
         return 0;