Merged in sandervrijders/ouroboros/be-routing-fix (pull request #412)

ipcpd: normal: Initialize qosspec

4 files changed, 8 insertions, 0 deletions

diff --git a/src/ipcpd/normal/graph.c b/src/ipcpd/normal/graph.c
index 85bb3fe2..2a7dbd9a 100644
--- a/src/ipcpd/normal/graph.c
+++ b/src/ipcpd/normal/graph.c
@@ -167,6 +167,8 @@ void graph_destroy(struct graph * graph)
         pthread_mutex_unlock(&graph->lock);
 
         pthread_mutex_destroy(&graph->lock);
+
+        free(graph);
 }
 
 int graph_add_edge(struct graph * graph,
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 82381ba7..00ecaae9 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -217,6 +217,8 @@ void shutdown_components(void)
         ribmgr_fini();
 
         addr_auth_fini();
+
+        free(ipcpi.dif_name);
 }
 
 static int normal_ipcp_enroll(char * dst_name)
diff --git a/src/ipcpd/normal/neighbors.c b/src/ipcpd/normal/neighbors.c
index 66da0462..d50732cb 100644
--- a/src/ipcpd/normal/neighbors.c
+++ b/src/ipcpd/normal/neighbors.c
@@ -89,6 +89,8 @@ void nbs_destroy(struct nbs * nbs)
 
         pthread_mutex_destroy(&nbs->list_lock);
         pthread_mutex_destroy(&nbs->notifiers_lock);
+
+        free(nbs);
 }
 
 int nbs_add(struct nbs * nbs,
diff --git a/src/ipcpd/normal/routing.c b/src/ipcpd/normal/routing.c
index 211becb4..70999951 100644
--- a/src/ipcpd/normal/routing.c
+++ b/src/ipcpd/normal/routing.c
@@ -161,6 +161,8 @@ static int read_fso(char *  path,
         fso_t *   fso;
         qosspec_t qs;
 
+        memset(&qs, 0, sizeof(qs));
+
         len = rib_read(path, ro, BUF_SIZE);
         if (len < 0) {
                 log_err("Failed to read FSO.");