summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-27 06:32:02 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-27 06:32:02 +0000
commit4d5304234f1e9b99fdb738e15f0d55fa53385e43 (patch)
tree5aa6f583f01cf0523ac78d56d66ffb378e5fc5c1
parent1624d1d57db3cfde3b4f42a55580f5a1e742f28e (diff)
downloadhercules-4d5304234f1e9b99fdb738e15f0d55fa53385e43.tar.gz
hercules-4d5304234f1e9b99fdb738e15f0d55fa53385e43.tar.bz2
hercules-4d5304234f1e9b99fdb738e15f0d55fa53385e43.tar.xz
hercules-4d5304234f1e9b99fdb738e15f0d55fa53385e43.zip
* Added missing option 'log_db_db' to loginlog_config_read(loginlog_sql.c).
* Fixed a memory leak in account_db_sql_destroy. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13001 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/login/account_sql.c1
-rw-r--r--src/login/loginlog_sql.c3
3 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 54e73ea51..cd6b940ac 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/07/27
+ * Added missing option 'log_db_db' to loginlog_config_read(loginlog_sql.c).
+ * Fixed a memory leak in account_db_sql_destroy. [FlavioJS]
* Changed the way GM levels are handled
- removed conf/gm_account.txt
- added the gm level column to the txt savefile (after 'email' column)
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index b510949fa..9bd5e292e 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -125,6 +125,7 @@ static void account_db_sql_destroy(AccountDB* self)
Sql_Free(db->accounts);
db->accounts = NULL;
+ aFree(db);
}
/// Gets a property from this database.
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 96bff6957..69a1c1910 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -81,6 +81,9 @@ bool loginlog_config_read(const char* key, const char* value)
if( strcmpi(key, "log_db_pw") == 0 )
safestrncpy(log_db_pw, value, sizeof(log_db_pw));
else
+ if( strcmpi(key, "log_db_db") == 0 )
+ safestrncpy(log_db_db, value, sizeof(log_db_db));
+ else
if( strcmpi(key, "log_db") == 0 )
safestrncpy(log_db, value, sizeof(log_db));
else