]> git.puffer.fish Git - matthieu/frr.git/commitdiff
isisd: fix spftree_area_del typo causing SEGV
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 27 Nov 2012 01:10:27 +0000 (01:10 +0000)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 12 Dec 2012 14:38:07 +0000 (15:38 +0100)
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>
isisd/isis_spf.c

index 07b855b40d417cdcfd5bb8c9d07a4fc1b3775387..1cb51138119cd9527dad7ff7ab23b4e3a2a2fb28 100644 (file)
@@ -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;