From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 27 Nov 2012 01:10:27 +0000 (+0000)
Subject: isisd: fix spftree_area_del typo causing SEGV
X-Git-Tag: frr-2.0-rc1~1734
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=de543de3d7682eaeb8c9b657e9a3bb4bcd17993d;p=mirror%2Ffrr.git

isisd: fix spftree_area_del typo causing SEGV

spftree_area_del didn't clear the IPv6 L2 spftree due to a simple typo,
leading to a SEGV on shutdown when the still-armed timer would try to
run an IPv6 L2 SPF calculation with its data free'd already.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 07b855b40d..1cb5113811 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -365,7 +365,7 @@ spftree_area_del (struct isis_area *area)
       area->spftree[1] = NULL;
     }
 #ifdef HAVE_IPV6
-    if (area->spftree[1] != NULL)
+    if (area->spftree6[1] != NULL)
     {
       isis_spftree_del (area->spftree6[1]);
       area->spftree6[1] = NULL;