From: Tom Gundersen <teg@jklm.no>
Date: Wed, 10 Jun 2015 13:55:09 +0000 (+0200)
Subject: sd-network: allow NULL in sd_network_monitor_unref
X-Git-Tag: v221~136^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F142%2Fhead;p=thirdparty%2Fsystemd.git

sd-network: allow NULL in sd_network_monitor_unref

Match rest of codebase, we always allow unref'ing NULL.
---

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index db1f6997cbb..587941497d6 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -329,10 +329,10 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
 _public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
         int fd;
 
-        assert_return(m, NULL);
-
-        fd = MONITOR_TO_FD(m);
-        close_nointr(fd);
+        if (m) {
+                fd = MONITOR_TO_FD(m);
+                close_nointr(fd);
+        }
 
         return NULL;
 }