Mercurial > hg > openttd
changeset 5349:3346403e9a14 draft
(svn r7520) -Fix(r7348): memleak due to unconditionally overwriting the filename, name and info of a GRFConfig in IsGoodGRFConfigList.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Wed, 20 Dec 2006 23:44:39 +0000 |
parents | ed3dff9b8ad1 |
children | 2423262a9f8c |
files | newgrf_config.c |
diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/newgrf_config.c +++ b/newgrf_config.c @@ -163,9 +163,17 @@ res = false; } else { DEBUG(grf, 1) ("[GRF] Loading GRF %08X from %s", BSWAP32(c->grfid), f->filename); - c->filename = strdup(f->filename); - c->name = strdup(f->name); - c->info = strdup(f->info); + /* The filename could be the filename as in the savegame. As we need + * to load the GRF here, we need the correct filename, so overwrite that + * in any case and set the name and info when it is not set already. + * When the GCF_COPY flag is set, it is certain that the filename is + * already a local one, so there is no need to replace it. */ + if (!HASBIT(c->flags, GCF_COPY)) { + free(c->filename); + c->filename = strdup(f->filename); + if (c->name == NULL) c->name = strdup(f->name); + if (c->info == NULL) c->info = strdup(f->info); + } } }