From: F. Aragon <paco@voltanet.io>
Date: Mon, 2 Jul 2018 15:44:58 +0000 (+0200)
Subject: ospfd pimd: null check (PVS-Studio)
X-Git-Tag: frr-6.1-dev~190^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2605%2Fhead;p=mirror%2Ffrr.git

ospfd pimd: null check (PVS-Studio)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index c799a4b30f..d84fd26ac4 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -543,7 +543,7 @@ static int ospf_ase_route_match_same(struct route_table *rt,
 				     struct ospf_route *newor)
 {
 	struct route_node *rn;
-	struct ospf_route * or ;
+	struct ospf_route *or;
 	struct ospf_path *op;
 	struct ospf_path *newop;
 	struct listnode *n1;
@@ -559,6 +559,9 @@ static int ospf_ase_route_match_same(struct route_table *rt,
 	route_unlock_node(rn);
 
 	or = rn->info;
+
+	assert(or);
+
 	if (or->path_type != newor->path_type)
 		return 0;
 
@@ -577,6 +580,8 @@ static int ospf_ase_route_match_same(struct route_table *rt,
 		return 0;
 	}
 
+	assert(or->paths);
+
 	if (or->paths->count != newor->paths->count)
 		return 0;
 
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index c7e1a18d28..dd30678405 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -158,7 +158,7 @@ static int pim_mroute_msg_nocache(int fd, struct interface *ifp,
 	 * the Interface type is SSM we don't need to
 	 * do anything here
 	 */
-	if ((pim_rpf_addr_is_inaddr_none(rpg)) || (!pim_ifp)
+	if (!rpg || (pim_rpf_addr_is_inaddr_none(rpg))
 	    || (!(PIM_I_am_DR(pim_ifp)))) {
 		if (PIM_DEBUG_MROUTE_DETAIL)
 			zlog_debug(