pbrd: fix problem removing nonexistent nexthop

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
donaldsharp · Feb 21, 2018 · a7f139a · a7f139a
1 parent fbe26fe
commit a7f139a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
@@ -263,12 +263,14 @@ DEFPY(ecmp_nexthops,
 
 	nh = nexthop_exists(&nhgc->nhg, &nhop);
 
-	if (no && nh) {
-		nexthop_del(&nhgc->nhg, nh);
-		nexthop_free(nh);
+	if (no) {
+		if (nh) {
+			nexthop_del(&nhgc->nhg, nh);
+			nexthop_free(nh);
 
-		if (nhg_hooks.del_nexthop)
-			nhg_hooks.del_nexthop(nhgc->name);
+			if (nhg_hooks.del_nexthop)
+				nhg_hooks.del_nexthop(nhgc->name);
+		}
 	} else if (!nh) {
 		/* must be adding new nexthop since !no and !nexthop_exists */
 		nh = nexthop_new();