X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hp=455b2301e95333fc78d5ec68adfd8cf1c4c055fb;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee

diff --git a/src/edge.c b/src/edge.c
index 455b2301..afe9cfe3 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -37,13 +37,15 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 
 	result = a->weight - b->weight;
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
 	result = strcmp(a->from->name, b->from->name);
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
 	return strcmp(a->to->name, b->to->name);
 }
@@ -61,7 +63,11 @@ void free_edge_tree(splay_tree_t *edge_tree) {
 }
 
 void exit_edges(meshlink_handle_t *mesh) {
-	splay_delete_tree(mesh->edges);
+	if(mesh->edges) {
+		splay_delete_tree(mesh->edges);
+	}
+
+	mesh->edges = NULL;
 }
 
 /* Creation and deletion of connection elements */
@@ -82,19 +88,24 @@ void edge_add(meshlink_handle_t *mesh, edge_t *e) {
 
 	e->reverse = lookup_edge(e->to, e->from);
 
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = e;
+	}
 }
 
 void edge_del(meshlink_handle_t *mesh, edge_t *e) {
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = NULL;
+	}
 
 	splay_delete(mesh->edges, e);
 	splay_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
+	assert(from);
+	assert(to);
+
 	edge_t v;
 
 	v.from = from;