From: Tom Gundersen <teg@jklm.no>
Date: Tue, 8 Apr 2014 19:26:19 +0000 (+0200)
Subject: networkd: guard against NULL pointers
X-Git-Tag: v213~456
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7ff8f4b53c158833b87899090552b18c922596de

networkd: guard against NULL pointers

This should never be a problem, but better be safe than sorry.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 63d253d94..f07652553 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1299,6 +1299,7 @@ static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
         int r;
 
         assert(link);
+        assert(link->ifname);
 
         if (link->state == LINK_STATE_FAILED)
                 return 1;
@@ -1510,11 +1511,16 @@ int link_update(Link *link, sd_rtnl_message *m) {
 int link_save(Link *link) {
         _cleanup_free_ char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;
+        const char *state;
         int r;
 
         assert(link);
         assert(link->state_file);
 
+        state = link_state_to_string(link->state);
+        if (!state)
+                goto finish;
+
         r = fopen_temporary(link->state_file, &f, &temp_path);
         if (r < 0)
                 goto finish;
@@ -1523,8 +1529,7 @@ int link_save(Link *link) {
 
         fprintf(f,
                 "# This is private data. Do not parse.\n"
-                "STATE=%s\n",
-                link_state_to_string(link->state));
+                "STATE=%s\n", state);
 
         if (link->dhcp_lease) {
                 _cleanup_free_ char *lease_file = NULL;