Merge pull request #1584 from donaldsharp/1575_fix

zebra: Fix dest dereference
FRRouting · Jan 2, 2018 · baa68bc · baa68bc
2 parents 82b9bf3 + 607425e
commit baa68bc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
@@ -1471,7 +1471,14 @@ static void rib_process(struct route_node *rn)
 	if (IS_ZEBRA_DEBUG_RIB_DETAILED)
 		zlog_debug("%u:%s: Processing rn %p", vrf_id, buf, rn);
 
-	old_fib = dest->selected_fib;
+	/*
+	 * we can have rn's that have a NULL info pointer
+	 * (dest).  As such let's not let the deref happen
+	 * additionally we know RNODE_FOREACH_RE_SAFE
+	 * will not iterate so we are ok.
+	 */
+	if (dest)
+		old_fib = dest->selected_fib;
 
 	RNODE_FOREACH_RE_SAFE (rn, re, next) {
 		if (IS_ZEBRA_DEBUG_RIB_DETAILED)