ospfd: Minor memory fixes

Signed-off-by: GalaxyGorilla <sascha@netdef.org>

diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index cacf858cf267ce40452199930bf40d7bcd1f5503..080256e5a79d16d54e22721a85fd5be6a4ce162d 100644 (file)
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -1244,6 +1244,8 @@ static uint16_t get_reverse_distance(struct vertex *v,
        struct router_lsa_link *w_link;
        uint16_t distance = 0;
 
+       assert(w_lsa && w_lsa->data);
+
        p = ((uint8_t *)w_lsa->data) + OSPF_LSA_HEADER_SIZE + 4;
        lim = ((uint8_t *)w_lsa->data) + ntohs(w_lsa->data->length);
 
@@ -1268,7 +1270,8 @@ static uint16_t get_reverse_distance(struct vertex *v,
        if (distance == 0)
                distance = ntohs(l->m[0].metric);
 
-       zlog_debug("%s: reversed distance is %u", __func__, distance);
+       if (IS_DEBUG_OSPF_EVENT)
+               zlog_debug("%s: reversed distance is %u", __func__, distance);
 
        return distance;
 }

diff --git a/ospfd/ospf_ti_lfa.c b/ospfd/ospf_ti_lfa.c
index e75922df14dd9e37ae3a101a806324bcf376c716..4a0186bfb917ab4bbb76d9b602bf583a3d85faf2 100644 (file)
--- a/ospfd/ospf_ti_lfa.c
+++ b/ospfd/ospf_ti_lfa.c
@@ -128,6 +128,9 @@ static void ospf_ti_lfa_find_q_node(struct vertex *pc_node,
        p_node = ospf_spf_vertex_find(pc_node->id, p_space->vertex_list);
        q_node = ospf_spf_vertex_find(pc_node->id, q_space->vertex_list);
 
+       /* The Q node is always present. */
+       assert(q_node);
+
        q_space->q_node_info->type = OSPF_TI_LFA_UNDEFINED_NODE;
 
        if (p_node && q_node) {
@@ -1040,10 +1043,11 @@ void ospf_ti_lfa_insert_backup_paths(struct ospf_area *area,
                        }
 
                        if (path->srni.backup_label_stack) {
-                               mpls_label2str(q_space->label_stack->num_labels,
-                                              q_space->label_stack->label,
-                                              label_buf, MPLS_LABEL_STRLEN,
-                                              true);
+                               mpls_label2str(
+                                       path->srni.backup_label_stack
+                                               ->num_labels,
+                                       path->srni.backup_label_stack->label,
+                                       label_buf, MPLS_LABEL_STRLEN, true);
                                if (IS_DEBUG_OSPF_TI_LFA)
                                        zlog_debug(
                                                "%s: inserted backup path %s for prefix %pFX, router id %pI4 and nexthop %pI4.",