Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

memory leak: properly free terrain_production objects

This commit is contained in:
Enno Rehling 2015-09-11 12:17:35 +02:00
parent 59e2c12605
commit c707ff39b6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/terrain.c
View File

@ -59,10 +59,18 @@ static terrain_type *registered_terrains;
void free_terrains(void) void free_terrains(void)
{ {
while (registered_terrains) { while (registered_terrains) {
int n;
terrain_type * t = registered_terrains; terrain_type * t = registered_terrains;
registered_terrains = t->next; registered_terrains = t->next;
free(t->_name); free(t->_name);
free(t->production); if (t->production) {
for (n = 0; t->production[n].type; ++n) {
free(t->production[n].base);
free(t->production[n].divisor);
free(t->production[n].startlevel);
}
free(t->production);
}
free(t); free(t);
} }
} }

6
src/kernel/terrain.h
View File

@ -51,9 +51,9 @@ extern "C" {
typedef struct terrain_production { typedef struct terrain_production {
const struct resource_type *type; const struct resource_type *type;
const char *startlevel; char *startlevel;
const char *base; char *base;
const char *divisor; char *divisor;
float chance; float chance;
} terrain_production; } terrain_production;