From 21b0b61a99c883f85dc5c30d6bde16de2159ae0a Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 4 Jan 2012 04:50:43 +0000 Subject: [PATCH] Fixed atcommand aliases memory leak, bugreport:5200 git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15383 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 1c59b81a2c..03ce58015a 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9332,10 +9332,25 @@ int atcommand_config_read(const char* cfgName) return 0; } +static int atcommand_db_free(DBKey key,void *data,va_list va) { + + aFree((AtCommandInfo*)data); + + return 1; +} + +void atcommand_db_clear() { + + atcommand_db->foreach(atcommand_db,atcommand_db_free); + db_destroy(atcommand_db); + + return; +} + void atcommand_doload() { if( atcommand_db != NULL ) - db_destroy(atcommand_db); + atcommand_db_clear(); atcommand_db = stridb_alloc(DB_OPT_DUP_KEY, 0); atcommand_basecommands();//fills initial atcommand_db with known commands @@ -9355,8 +9370,8 @@ void do_init_atcommand() { } void do_final_atcommand() { - - db_destroy(atcommand_db); + + atcommand_db_clear(); return; }