diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 03:00:51 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 03:00:51 +0000 |
| commit | a268f0dce511b6549cb2686d4bde2aaa6641ae33 (patch) | |
| tree | 101ab7d22f5dc6e68fa1a8926ae7c9ecdc71234f /src/common/grfio.c | |
| parent | 492dee2050bbfa25a16050143cd175b8ecedf355 (diff) | |
| download | hercules-a268f0dce511b6549cb2686d4bde2aaa6641ae33.tar.gz hercules-a268f0dce511b6549cb2686d4bde2aaa6641ae33.tar.bz2 hercules-a268f0dce511b6549cb2686d4bde2aaa6641ae33.tar.xz hercules-a268f0dce511b6549cb2686d4bde2aaa6641ae33.zip | |
Fixed memleak hell during mapserver shutdown (if grf reading is used and the deallocation routine is actually called).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11439 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/grfio.c')
| -rw-r--r-- | src/common/grfio.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c index 4b68ea9fc..4e5da0a6a 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -777,20 +777,26 @@ static int grfio_add(char* fname) // removes all entries void grfio_final(void) { - if (filelist != NULL) - aFree(filelist); + if (filelist != NULL) { + int i; + for (i = 0; i < filelist_entrys; i++) + if (filelist[i].fnd != NULL) + aFree(filelist[i].fnd); + aFree(filelist); + filelist = NULL; + } filelist_entrys = filelist_maxentry = 0; if (gentry_table != NULL) { int i; - for (i = 0; i < gentry_entrys; i++) { + for (i = 0; i < gentry_entrys; i++) if (gentry_table[i] != NULL) aFree(gentry_table[i]); - } + aFree(gentry_table); + gentry_table = NULL; } - gentry_table = NULL; gentry_entrys = gentry_maxentry = 0; } |