]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Do not crash when attempting to install a mroute.
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 24 Aug 2016 19:35:09 +0000 (15:35 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 22 Dec 2016 01:26:07 +0000 (20:26 -0500)
When installing a mroute on rpf change make sure
that we have oil for it at this time.

Ticket: CM-12636
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_zebra.c

index aa1121c8a228e2a34fb9c76e11de210a12341b90..8a466e4035cf3c007ad612edb519c2fd88c45f56 100644 (file)
@@ -347,7 +347,7 @@ static void scan_upstream_rpf_cache()
         * where the mroute has not been installed
         * so install it.
         */
-       if (!up->channel_oil->installed)
+       if (up->channel_oil && !up->channel_oil->installed)
           pim_mroute_add (up->channel_oil);
 
        /*