2005-10-23 Paul Jakma <paul.jakma@sun.com>

* ospf_apiserver.c: (ospf_apiserver_term) This function should
	  not have side-effects (eg segv) if no apiserver instances are
	  active, ie be robust.
This commit is contained in:
paul 2005-10-23 15:26:24 +00:00
parent b8ad39d47a
commit e029d44858
2 changed files with 7 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2005-10-23 Paul Jakma <paul.jakma@sun.com> 2005-10-23 Paul Jakma <paul.jakma@sun.com>
* ospf_apiserver.c: (ospf_apiserver_term) This function should
not have side-effects (eg segv) if no apiserver instances are
active, ie be robust.
* ospf_vty.c: (show_ip_ospf) fix display of SPF timer if it * ospf_vty.c: (show_ip_ospf) fix display of SPF timer if it
has not yet been run. has not yet been run.

View File

@ -189,10 +189,12 @@ ospf_apiserver_term (void)
* Free all client instances. ospf_apiserver_free removes the node * Free all client instances. ospf_apiserver_free removes the node
* from the list, so we examine the head of the list anew each time. * from the list, so we examine the head of the list anew each time.
*/ */
while ( (apiserv = listgetdata (listhead (apiserver_list))) != NULL) while ( apiserver_list &&
(apiserv = listgetdata (listhead (apiserver_list))) != NULL)
ospf_apiserver_free (apiserv); ospf_apiserver_free (apiserv);
/* Free client list itself */ /* Free client list itself */
if (apiserver_list)
list_delete (apiserver_list); list_delete (apiserver_list);
/* Free wildcard list */ /* Free wildcard list */