From b91483219d36a4fb7359a5fdc17cedaf73b18dc5 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 29 Jul 2008 07:59:27 +0000 Subject: Fixed Sql object not initializing default values properly. Fixed Sql_Free producing timer deallocation errors when called without first establishing a database connection. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13011 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ src/common/sql.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 365cb6ed4..9925e00cf 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ 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/29 + * Fixed Sql object not initializing default values properly. + Fixed Sql_Free producing timer deallocation errors when called + without first establishing a database connection. * Corrected upgrade_svn12975_view.sql not assigning default values to the two dummy columns; please drop the view and re-run the script. 2008/07/27 diff --git a/src/common/sql.c b/src/common/sql.c index 47ff320ea..0e8e7c2ae 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -67,9 +67,14 @@ struct SqlStmt Sql* Sql_Malloc(void) { Sql* self; + CREATE(self, Sql, 1); mysql_init(&self->handle); StringBuf_Init(&self->buf); + self->lengths = NULL; + self->result = NULL; + self->keepalive = INVALID_TIMER; + return self; } @@ -406,7 +411,7 @@ void Sql_Free(Sql* self) { Sql_FreeResult(self); StringBuf_Destroy(&self->buf); - delete_timer(self->keepalive, Sql_P_KeepaliveTimer); + if( self->keepalive != INVALID_TIMER ) delete_timer(self->keepalive, Sql_P_KeepaliveTimer); aFree(self); } } -- cgit v1.2.3-70-g09d2