dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7517) -Codechange: Set pointers to NULL when freeing the newgrf config variables and add the proper const to CopyGRFConfigList

Browse Source
This commit is contained in:
Darkvater
2006-12-20 20:43:52 +00:00
parent 9011371e83
commit 1812bcfc8c
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
newgrf_config.c
View File

@@ -82,15 +82,16 @@ bool FillGRFDetails(GRFConfig *config, bool is_static)
}
void ClearGRFConfig(GRFConfig *config)
void ClearGRFConfig(GRFConfig **config)
{
/* GCF_COPY as in NOT strdupped/alloced the filename, name and info */
if (!HASBIT(config->flags, GCF_COPY)) {
free(config->filename);
free(config->name);
free(config->info);
if (!HASBIT((*config)->flags, GCF_COPY)) {
free((*config)->filename);
free((*config)->name);
free((*config)->info);
}
free(config);
free(*config);
*config = NULL;
}
@@ -100,13 +101,13 @@ void ClearGRFConfigList(GRFConfig *config)
GRFConfig *c, *next;
for (c = config; c != NULL; c = next) {
next = c->next;
ClearGRFConfig(c);
ClearGRFConfig(&c);
}
}
/* Copy a GRF Config list */
static GRFConfig **CopyGRFConfigList(GRFConfig **dst, GRFConfig *src)
GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src)
{
GRFConfig *c;