diff options
| author | paul <paul> | 2004-11-15 11:48:37 +0000 |
|---|---|---|
| committer | paul <paul> | 2004-11-15 11:48:37 +0000 |
| commit | 788dab10f51f55670dd49f990a016b838e92b9da (patch) | |
| tree | 594089dd7e3f0dfaf529d66a847f44a613e069f3 | |
| parent | fbaf39e9b00580e8df2d5d50f97643b42caf1868 (diff) | |
2004-11-15 Paul Jakma <paul@dishone.st>
* ospf_{apiserver,te}.c: ospf_lsa_free's should be ospf_lsa_unlock.
| -rw-r--r-- | ospfd/ChangeLog | 4 | ||||
| -rw-r--r-- | ospfd/ospf_apiserver.c | 5 | ||||
| -rw-r--r-- | ospfd/ospf_te.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 85d99508..b8f526e7 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,3 +1,7 @@ +2004-11-15 Paul Jakma <paul@dishone.st> + + * ospf_{apiserver,te}.c: ospf_lsa_free's should be ospf_lsa_unlock. + 2004-11-12 Paul Jakma <paul@dishone.st> * ospf_ia.c: (process_summary_lsa) Only an ABR has any reason to diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 96fb9179..8bc16dc3 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -1529,8 +1529,7 @@ ospf_apiserver_opaque_lsa_new (struct ospf_area *area, if ((new->data = ospf_lsa_data_new (length)) == NULL) { zlog_warn ("ospf_apiserver_opaque_lsa_new: ospf_lsa_data_new() ?"); - ospf_lsa_free (new); - new = NULL; + ospf_lsa_unlock (new); stream_free (s); return NULL; } @@ -1895,7 +1894,7 @@ ospf_apiserver_lsa_refresher (struct ospf_lsa *lsa) if (ospf_lsa_install (ospf, new->oi, new) == NULL) { zlog_warn ("ospf_apiserver_lsa_refresher: ospf_lsa_install failed"); - ospf_lsa_free (new); + ospf_lsa_unlock (new); goto out; } diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index f62f35c4..4a28ae83 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -903,7 +903,7 @@ ospf_mpls_te_lsa_new (struct ospf_area *area, struct mpls_te_link *lp) if ((new->data = ospf_lsa_data_new (length)) == NULL) { zlog_warn ("ospf_mpls_te_lsa_new: ospf_lsa_data_new() ?"); - ospf_lsa_free (new); + ospf_lsa_unlock (new); new = NULL; stream_free (s); goto out; @@ -935,7 +935,7 @@ ospf_mpls_te_lsa_originate1 (struct ospf_area *area, struct mpls_te_link *lp) if (ospf_lsa_install (area->ospf, NULL/*oi*/, new) == NULL) { zlog_warn ("ospf_mpls_te_lsa_originate1: ospf_lsa_install() ?"); - ospf_lsa_free (new); + ospf_lsa_unlock (new); goto out; } @@ -1055,7 +1055,7 @@ ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa) if (ospf_lsa_install (area->ospf, NULL/*oi*/, new) == NULL) { zlog_warn ("ospf_mpls_te_lsa_refresh: ospf_lsa_install() ?"); - ospf_lsa_free (new); + ospf_lsa_unlock (new); goto out; } |