From 739e93fd23f91e433829dfaa5969e75528f861cd Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 21 Dec 2006 10:09:43 +0000 Subject: (svn r7522) -Codechange: Have CopyGRFConfigList clear the destination list before assigning values to it. This cuts down on memleaks which could exist when the function was not used carefully. --- newgrf_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newgrf_config.c b/newgrf_config.c index f1b9b00ea..b70c8354f 100644 --- a/newgrf_config.c +++ b/newgrf_config.c @@ -115,6 +115,8 @@ GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src) { GRFConfig *c; + /* Clear destination as it will be overwritten */ + ClearGRFConfigList(dst); for (; src != NULL; src = src->next) { c = calloc(1, sizeof(*c)); *c = *src; @@ -135,8 +137,6 @@ void ResetGRFConfig(bool defaults) { GRFConfig **c = &_grfconfig; - ClearGRFConfigList(c); - if (defaults) c = CopyGRFConfigList(c, _grfconfig_newgame); CopyGRFConfigList(c, _grfconfig_static); } -- cgit v1.2.3-70-g09d2