[Nagios-checkins] CVS: nagios/common comments.c,1.7,1.8 objects.c,1.41,1.42 statusdata.c,1.14,1.15

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6929/common

Modified Files:
	comments.c objects.c statusdata.c 
Log Message:
Fix for chained hash free segfault

Index: comments.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/comments.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** comments.c	18 Jun 2003 00:45:33 -0000	1.7
--- comments.c	19 Jun 2003 04:43:05 -0000	1.8
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-16-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-18-2003
   *
   * License:
***************
*** 546,550 ****
  	        }
  
! 	/* reset list pointer */
  	comment_list=NULL;
  
--- 546,552 ----
  	        }
  
! 	/* free hash list and reset list pointer */
! 	free(comment_hashlist);
! 	comment_hashlist=NULL;
  	comment_list=NULL;
  

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** objects.c	18 Jun 2003 00:45:33 -0000	1.41
--- objects.c	19 Jun 2003 04:43:05 -0000	1.42
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-17-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-18-2003
   *
   * License:
***************
*** 5724,5728 ****
  		}
  
! 	/* reset the host pointer */
  	timeperiod_list=NULL;
  
--- 5724,5730 ----
  		}
  
! 	/* free hashlist and reset pointers */
! 	free(timeperiod_hashlist);
! 	timeperiod_hashlist=NULL;
  	timeperiod_list=NULL;
  
***************
*** 5771,5775 ****
  	        }
  
! 	/* reset host list pointer */
  	host_list=NULL;
  
--- 5773,5779 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(host_hashlist);
! 	host_hashlist=NULL;
  	host_list=NULL;
  
***************
*** 5798,5802 ****
  		}
  
! 	/* reset the hostgroup pointer */
  	hostgroup_list=NULL;
  
--- 5802,5808 ----
  		}
  
! 	/* free hashlist and reset pointers */
! 	free(hostgroup_hashlist);
! 	hostgroup_hashlist=NULL;
  	hostgroup_list=NULL;
  
***************
*** 5826,5830 ****
  		}
  
! 	/* reset the servicegroup pointer */
  	servicegroup_list=NULL;
  
--- 5832,5838 ----
  		}
  
! 	/* free hashlist and reset pointers */
! 	free(servicegroup_hashlist);
! 	servicegroup_hashlist=NULL;
  	servicegroup_list=NULL;
  
***************
*** 5866,5870 ****
  		}
  
! 	/* reset the contact pointer */
  	contact_list=NULL;
  
--- 5874,5880 ----
  		}
  
! 	/* free hashlist and reset pointers */
! 	free(contact_hashlist);
! 	contact_hashlist=NULL;
  	contact_list=NULL;
  
***************
*** 5893,5897 ****
  		}
  
! 	/* reset the contactgroup pointer */
  	contactgroup_list=NULL;
  
--- 5903,5909 ----
  		}
  
! 	/* free hashlist and reset pointers */
! 	free(contactgroup_hashlist);
! 	contactgroup_hashlist=NULL;
  	contactgroup_list=NULL;
  
***************
*** 5930,5934 ****
  	        }
  
! 	/* reset service list pointer */
  	service_list=NULL;
  
--- 5942,5948 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(service_hashlist);
! 	service_hashlist=NULL;
  	service_list=NULL;
  
***************
*** 5947,5951 ****
  	        }
  
! 	/* reset the command list */
  	command_list=NULL;
  
--- 5961,5967 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(command_hashlist);
! 	command_hashlist=NULL;
  	command_list=NULL;
  
***************
*** 5965,5969 ****
  	        }
  
! 	/* reset the service escalation list */
  	serviceescalation_list=NULL;
  
--- 5981,5987 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(serviceescalation_hashlist);
! 	serviceescalation_hashlist=NULL;
  	serviceescalation_list=NULL;
  
***************
*** 5984,5988 ****
  	        }
  
! 	/* reset the service dependency list */
  	servicedependency_list=NULL;
  
--- 6002,6008 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(servicedependency_hashlist);
! 	servicedependency_hashlist=NULL;
  	servicedependency_list=NULL;
  
***************
*** 6001,6005 ****
  	        }
  
! 	/* reset the host dependency list */
  	hostdependency_list=NULL;
  
--- 6021,6027 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(hostdependency_hashlist);
! 	hostdependency_hashlist=NULL;
  	hostdependency_list=NULL;
  
***************
*** 6018,6022 ****
  	        }
  
! 	/* reset the host escalation list */
  	hostescalation_list=NULL;
  
--- 6040,6046 ----
  	        }
  
! 	/* free hashlist and reset pointers */
! 	free(hostescalation_hashlist);
! 	hostescalation_hashlist=NULL;
  	hostescalation_list=NULL;
  
***************
*** 6065,6068 ****
--- 6089,6095 ----
  #endif
  
+ 	/* free hashlist and reset pointers */
+ 	free(hostextinfo_hashlist);
+ 	hostextinfo_hashlist=NULL;
  	hostextinfo_list=NULL;
  
***************
*** 6083,6086 ****
--- 6110,6116 ----
  #endif
  
+ 	/* free hashlist and reset pointers */
+ 	free(serviceextinfo_hashlist);
+ 	serviceextinfo_hashlist=NULL;
  	serviceextinfo_list=NULL;
  

Index: statusdata.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/statusdata.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** statusdata.c	16 Jun 2003 03:49:00 -0000	1.14
--- statusdata.c	19 Jun 2003 04:43:05 -0000	1.15
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-15-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-18-2003
   *
   * License:
***************
*** 485,489 ****
  	        }
  
! 	/* reset list pointers */
  	hoststatus_list=NULL;
  	servicestatus_list=NULL;
--- 485,493 ----
  	        }
  
! 	/* free hash lists reset list pointers */
! 	free(hoststatus_hashlist);
! 	free(servicestatus_hashlist);
! 	hoststatus_hashlist=NULL;
! 	servicestatus_hashlist=NULL;
  	hoststatus_list=NULL;
  	servicestatus_list=NULL;