Core/DBLayer: Add an assert in TransactionTask::Execute to make sure valid queries are held

Core/Logging: Tiny cleanup in sLog.outSQLDriver

--HG--
branch : trunk

2 files changed, 6 insertions, 1 deletions

diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp
index d0d8fc1dded..93dc8fdc195 100644
--- a/src/server/shared/Database/Transaction.cpp
+++ b/src/server/shared/Database/Transaction.cpp
@@ -56,6 +56,7 @@ bool TransactionTask::Execute()
     while (!queries.empty())
     {
         sql = queries.front();
+        ASSERT(sql);
         if (!m_conn->Execute(sql))
         {
             sLog.outSQLDriver("[Warning] Transaction aborted. %u queries not executed.", (uint32)queries.size());
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 70ecb9781c7..fe24701dd3b 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -547,16 +547,20 @@ void Log::outSQLDriver(const char* str, ...)
     va_end(ap);
 
     printf("\n");
+
     if (sqlLogFile)
     {
         outTimestamp(sqlLogFile);
+
+        va_list ap;
         va_start(ap, str);
         vfprintf(sqlLogFile, str, ap);
-        fprintf(sqlLogFile, "\n");
         va_end(ap);
 
+        fprintf(sqlLogFile, "\n");
         fflush(sqlLogFile);
     }
+
     fflush(stdout);
 }