From 20a7c80cc2efa52fec7d029cc1ad52c037a0824c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 31 May 2018 20:55:59 -0400 Subject: [PATCH] ospfd: lp may be null, make sure it isn't We lookup the lp value and lookup_linkparams_by_instance can return NULL if something has gone terribly wrong. Make sure that lp is not NULL. Signed-off-by: Donald Sharp --- ospfd/ospf_te.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 26df7a24cd..2b1b328617 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -1451,6 +1451,8 @@ static struct ospf_lsa *ospf_mpls_te_lsa_refresh(struct ospf_lsa *lsa) zlog_warn("ospf_mpls_te_lsa_refresh: Invalid parameter?"); lsa->data->ls_age = htons(OSPF_LSA_MAXAGE); /* Flush it anyway. */ + ospf_opaque_lsa_flush_schedule(lsa); + return NULL; } /* Check if lp was not disable in the interval */ @@ -1463,8 +1465,7 @@ static struct ospf_lsa *ospf_mpls_te_lsa_refresh(struct ospf_lsa *lsa) /* If the lsa's age reached to MaxAge, start flushing procedure. */ if (IS_LSA_MAXAGE(lsa)) { - if (lp) - UNSET_FLAG(lp->flags, LPFLG_LSA_ENGAGED); + UNSET_FLAG(lp->flags, LPFLG_LSA_ENGAGED); ospf_opaque_lsa_flush_schedule(lsa); return NULL; } -- 2.39.5