retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More paranoid about freeing pointers.

This commit is contained in:
paul 1998-05-20 12:22:15 +00:00
parent ddb0c21bd9
commit 43357c9425
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/conffile.c
View File

@ -1,4 +1,4 @@
/* $Id: conffile.c,v 1.18 1998/05/20 09:56:14 paul Exp $
/* $Id: conffile.c,v 1.19 1998/05/20 12:22:15 paul Exp $
*
* ISDN accounting for isdn4linux.
*
@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: conffile.c,v $
* Revision 1.19 1998/05/20 12:22:15 paul
* More paranoid about freeing pointers.
*
* Revision 1.18 1998/05/20 09:56:14 paul
* Oops, the temp string _was_ necessary. Made it static so that returning a
* pointer to it is not a problem.
@ -630,8 +633,14 @@ static void free_entry(entry *Ptr)
free_entry(Ptr->next);
free_section(Ptr->subsection);
free(Ptr->name);
free(Ptr->value);
if (Ptr->name) {
free(Ptr->name);
Ptr->name = NULL;
}
if (Ptr->value) {
free(Ptr->value);
Ptr->value = NULL;
}
free(Ptr);
}
@ -644,7 +653,10 @@ void free_section(section *Ptr)
free_section(Ptr->next);
free_entry(Ptr->entries);
free(Ptr->name);
if (Ptr->name) {
free(Ptr->name);
Ptr->name = NULL;
}
free(Ptr);
}
@ -834,26 +846,26 @@ static char** Compare_Section_Get_Path(char **array, int *retsize, int *retdepth
if ((indexptr = (int*) calloc(index,sizeof(int))) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return NULL;
}
if ((retptr = (char**) calloc(index+1,sizeof(char*))) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return NULL;
}
if ((arrayptr = (char***) calloc(index,sizeof(char**))) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return NULL;
}
for (i=0; array[i] != NULL; i++)
if ((arrayptr[i] = String_to_Array(array[i],C_OR)) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return NULL;
}
@ -975,12 +987,12 @@ static void free_cfile(cfile **cfiles)
cptr = cfiles;
while (*cptr != NULL)
{
free((*cptr)->name);
if ((*cptr)->name)
free((*cptr)->name);
free(*cptr);
cptr++;
}
free(cfiles);
cfiles = NULL;
}
return;
@ -1013,13 +1025,13 @@ int read_files(section **main_sec, char** files, int *fileflag, char **variables
{
if ((cfiles = (cfile**) realloc(cfiles,sizeof(cfile*)*(i+2))) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return -1;
}
if ((cfiles[i] = (cfile*) calloc(1,sizeof(cfile))) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return -1;
}
@ -1027,7 +1039,7 @@ int read_files(section **main_sec, char** files, int *fileflag, char **variables
if (stat(files[i],&FileStat) != 0 && !(flags & C_NO_WARN_FILE))
{
print_msg("Can not open file `%s': %s!\n",files[i],strerror(errno));
print_msg("Can't open file `%s': %s!\n",files[i],strerror(errno));
return -1;
}
@ -1052,7 +1064,7 @@ int read_files(section **main_sec, char** files, int *fileflag, char **variables
{
if (!(flags & C_NO_WARN_FILE))
{
print_msg("Can not open file `%s': %s!\n",cfiles[i]->name,strerror(errno));
print_msg("Can't open file `%s': %s!\n",cfiles[i]->name,strerror(errno));
return -1;
}
}
@ -1578,7 +1590,7 @@ int Replace_Variables(section *Section)
{
if ((Ptr = strdup(Ptr)) == NULL)
{
print_msg("%s","Can not allocate memory!\n");
print_msg("%s","Can't allocate memory!\n");
return -1;
}