summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2021-05-17 16:50:03 +0200
committerSander Vrijders <sander@ouroboros.rocks>2021-05-28 08:19:53 +0200
commitf44ff4dc6d903a626f86919567ce382be31eb3b2 (patch)
treeb40eea6d4b1694999e96972b7bf1e230903b31d4
parentc43dfe6ef88910eeff96c76a424e74a554d11c55 (diff)
downloadouroboros-f44ff4dc6d903a626f86919567ce382be31eb3b2.zip
ouroboros-f44ff4dc6d903a626f86919567ce382be31eb3b2.tar.gz
ipcpd: Fix free of uninitialized variable in graph.c
The new GCC 11.1 compiler discovered s_dist would be uninitialized with an unknown policy, so it doesn't need to be free'd. Also removes some unneeded includes in broadcast dt.c that I had pending. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
-rw-r--r--src/ipcpd/broadcast/dt.c2
-rw-r--r--src/ipcpd/unicast/pol/graph.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ipcpd/broadcast/dt.c b/src/ipcpd/broadcast/dt.c
index c3f4090..8b15008 100644
--- a/src/ipcpd/broadcast/dt.c
+++ b/src/ipcpd/broadcast/dt.c
@@ -33,7 +33,6 @@
#define DT "dt"
#define OUROBOROS_PREFIX DT
-#include <ouroboros/endian.h>
#include <ouroboros/dev.h>
#include <ouroboros/errno.h>
#include <ouroboros/fqueue.h>
@@ -45,7 +44,6 @@
#include "common/comp.h"
#include "common/connmgr.h"
#include "dt.h"
-#include "ipcp.h"
#include <assert.h>
#include <stdlib.h>
diff --git a/src/ipcpd/unicast/pol/graph.c b/src/ipcpd/unicast/pol/graph.c
index 51fd0c4..6ea5c50 100644
--- a/src/ipcpd/unicast/pol/graph.c
+++ b/src/ipcpd/unicast/pol/graph.c
@@ -834,7 +834,7 @@ int graph_routing_table(struct graph * graph,
break;
default:
log_err("Unsupported algorithm.");
- goto fail_algo;
+ goto fail_table;
}
pthread_mutex_unlock(&graph->lock);
@@ -843,8 +843,6 @@ int graph_routing_table(struct graph * graph,
return 0;
- fail_algo:
- free(s_dist);
fail_table:
pthread_mutex_unlock(&graph->lock);
return -1;