From: Paul Jakma <paul@quagga.net>
Date: Thu, 15 Apr 2010 10:39:05 +0000 (+0100)
Subject: ospfd: ospf_if_free can leave dangling references on ISM events - cancel them
X-Git-Tag: frr-2.0-rc1~2125
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cfd670f3af25dfc34d5c06e30d21160e3dfb6421;p=mirror%2Ffrr.git

ospfd: ospf_if_free can leave dangling references on ISM events - cancel them

* ospf_interface.c: (ospf_if_free) events with dangling pointers left
  scheduled can be seriously bad for ospfd's health. Cancel the event.
---

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index afe3acf133..f9dc4b09c9 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -335,6 +335,8 @@ ospf_if_free (struct ospf_interface *oi)
   listnode_delete (oi->ospf->oiflist, oi);
   listnode_delete (oi->area->oiflist, oi);
 
+  thread_cancel_event (master, oi);
+
   memset (oi, 0, sizeof (*oi));
   XFREE (MTYPE_OSPF_IF, oi);
 }