eigrp: Don't dereference NULL timer in a Neighbour

Current, a eigrp_neighbor only has a t_holddown timer when in state
EIGRP_NEIGHBOR_PENDING and EIGRP_NEIGHBOR_UP. In state
EIGRP_NEIGHBOR_DOWN it could be a NULL pointer. Don't dereference the
timer when dumping the neighbour table without first checking it
exists. If it does not exist, display - instead of the remaining time.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index db5e38d422cdebb6ecab1fd43f579beb7caae91e..aca6e5981601ab50f7aa83253403c1b8def48d88 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -252,7 +252,10 @@ void show_ip_eigrp_neighbor_sub(struct vty *vty, struct eigrp_neighbor *nbr,
 
        vty_out(vty, "%-3u %-17s %-21s", 0, eigrp_neigh_ip_string(nbr),
                eigrp_if_name_string(nbr->ei));
-       vty_out(vty, "%-7lu", thread_timer_remain_second(nbr->t_holddown));
+       if (nbr->t_holddown)
+               vty_out(vty, "%-7lu", thread_timer_remain_second(nbr->t_holddown));
+       else
+               vty_out(vty, "-      ");
        vty_out(vty, "%-8u %-6u %-5u", 0, 0, EIGRP_PACKET_RETRANS_TIME);
        vty_out(vty, "%-7lu", nbr->retrans_queue->count);
        vty_out(vty, "%u\n", nbr->recv_sequence_number);