summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorpaul <paul>2004-07-27 11:19:11 +0000
committerpaul <paul>2004-07-27 11:19:11 +0000
commit36c64efdfa81b04741fbc75929649973a5334055 (patch)
treec31fe5f44efe8ba91d31e970e03e83672bdb63c6 /ospfd
parent41c14a1fc3c97f8cfcb4ef8f8bce12a2d9ad29df (diff)
2004-07-27 Paul Jakma <paul@dishone.st>
* ospf_opaque.c: (ospf_opaque_lsa_flush_schedule) do not NULL out the LSA as then free_opaque_info_per_id() can never unlock (and free) the LSA. Reported by Gunnar Stigen.
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog6
-rw-r--r--ospfd/ospf_opaque.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 453036ea..e3a2dfed 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-27 Paul Jakma <paul@dishone.st>
+
+ * ospf_opaque.c: (ospf_opaque_lsa_flush_schedule) do not NULL out
+ the LSA as then free_opaque_info_per_id() can never unlock (and
+ free) the LSA. Reported by Gunnar Stigen.
+
2004-07-23 Paul Jakma <paul@dishone.st>
* ospf_network.c: Replace PKTINFO/RECVIF with call to
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 636839c0..73e9639c 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -2090,7 +2090,6 @@ ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa0)
oipt->id_list->head = oipt->id_list->tail = NULL;
/* Disassociate internal control information with the given lsa. */
- oipi->lsa = NULL;
free_opaque_info_per_id ((void *) oipi);
/* Force given lsa's age to MaxAge. */