Merge pull request #8671 from donaldsharp/pim_possible_crash

Pim possible crash

Author: Jafaral

pimd/pim_igmp.c

@@ -1028,8 +1028,8 @@ struct igmp_sock *pim_igmp_sock_add(struct list *igmp_sock_list,
 	sin.sin_addr = ifaddr;
 	sin.sin_port = 0;
 	if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) != 0) {
-		zlog_warn("Could not bind IGMP socket for %pI4 on %s",
-			  &ifaddr, ifp->name);
+		zlog_warn("Could not bind IGMP socket for %pI4 on %s: %s(%d)",
+			  &ifaddr, ifp->name, strerror(errno), errno);
 		close(fd);
 
 		return NULL;

pimd/pim_oil.c

@@ -426,9 +426,11 @@ static void pim_channel_update_mute(struct channel_oil *c_oil)
 	struct pim_interface *pim_reg_ifp;
 	struct pim_interface *vxlan_ifp;
 
-	pim_reg_ifp = c_oil->pim->regiface->info;
-	if (pim_reg_ifp)
-		pim_channel_update_oif_mute(c_oil, pim_reg_ifp);
+	if (c_oil->pim->regiface) {
+		pim_reg_ifp = c_oil->pim->regiface->info;
+		if (pim_reg_ifp)
+			pim_channel_update_oif_mute(c_oil, pim_reg_ifp);
+	}
 	vxlan_ifp = pim_vxlan_get_term_ifp(c_oil->pim);
 	if (vxlan_ifp)
 		pim_channel_update_oif_mute(c_oil, vxlan_ifp);