Handle rename to existing device

In the case of rename, delete_retain would be called twice. Once
when the interface is removed from the system, and again when
interface is being replaced during rename.

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/if.c b/lib/if.c
index 7c4fb1a4..f15242a2 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -131,13 +131,14 @@ if_create (const char *name, int namelen)
     ifp->name[namelen] = '\0';
 
     listnode_add_sort (iflist, ifp);
-    ifp->connected = list_new ();
-    ifp->connected->del = (void (*) (void *)) connected_free;
-    
-    if (if_master.if_new_hook)
-      (*if_master.if_new_hook) (ifp);
   }
 
+  ifp->connected = list_new ();
+  ifp->connected->del = (void (*) (void *)) connected_free;
+    
+  if (if_master.if_new_hook)
+    (*if_master.if_new_hook) (ifp);
+
   return ifp;
 }
 
@@ -149,7 +150,11 @@ if_delete_retain (struct interface *ifp)
     (*if_master.if_delete_hook) (ifp);
 
   /* Free connected address list */
-  list_delete (ifp->connected);
+  if (ifp->connected)
+    {
+      list_delete (ifp->connected);
+      ifp->connected = NULL;
+    }
 }
 
 /* Delete and free interface structure. */