Fixed server crash introduced in 45783b (Added password append option to enable http login from any ip: 'authserial <name> httppass')

Author: ccw808

Server/mods/deathmatch/logic/CAccountManager.cpp

@@ -268,11 +268,11 @@ void CAccountManager::Save ( CAccount* pAccount, bool bCheckForErrors )
 
     if (bCheckForErrors)
     {
-        m_pDatabaseManager->QueryWithCallbackf(m_hDbConnection, StaticDbCallback, this, strQuery);
+        m_pDatabaseManager->QueryWithCallback(m_hDbConnection, StaticDbCallback, this, strQuery);
     }
     else
     {
-        m_pDatabaseManager->Execf(m_hDbConnection, strQuery);
+        m_pDatabaseManager->Exec(m_hDbConnection, strQuery);
     }
 
     SaveAccountSerialUsage( pAccount );

Server/mods/deathmatch/logic/CDatabaseManager.cpp

@@ -34,18 +34,19 @@ class CDatabaseManagerImpl : public CDatabaseManager
     virtual void                    DoPulse                     ( void );
     virtual SConnectionHandle       Connect                     ( const SString& strType, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions );
     virtual bool                    Disconnect                  ( SConnectionHandle hConnection );
-    virtual SString                 PrepareString               ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs );
+    virtual SString                 PrepareString               ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr );
     virtual SString                 PrepareStringf              ( SConnectionHandle hConnection, const char* szQuery, ... );
-    virtual CDbJobData*             Exec                        ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs );
+    virtual CDbJobData*             Exec                        ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr );
     virtual CDbJobData*             Execf                       ( SConnectionHandle hConnection, const char* szQuery, ... );
-    virtual CDbJobData*             QueryStart                  ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs );
+    virtual CDbJobData*             QueryStart                  ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr );
     virtual CDbJobData*             QueryStartf                 ( SConnectionHandle hConnection, const char* szQuery, ... );
     virtual bool                    QueryPoll                   ( CDbJobData* pJobData, uint ulTimeout );
     virtual bool                    QueryFree                   ( CDbJobData* pJobData );
     virtual CDbJobData*             GetQueryFromId              ( SDbJobId id );
     virtual const SString&          GetLastErrorMessage         ( void )                    { return m_strLastErrorMessage; }
     virtual bool                    IsLastErrorSuppressed       ( void )                    { return m_bLastErrorSuppressed; }
     virtual bool                    QueryWithResultf            ( SConnectionHandle hConnection, CRegistryResult* pResult, const char* szQuery, ... );
+    virtual bool                    QueryWithCallback           ( SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const SString& strQuery, CLuaArguments* pArgs = nullptr );
     virtual bool                    QueryWithCallbackf          ( SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const char* szQuery, ... );
     virtual void                    SetLogLevel                 ( EJobLogLevelType logLevel, const SString& strLogFilename );
 
@@ -431,6 +432,42 @@ bool CDatabaseManagerImpl::QueryWithResultf ( SConnectionHandle hConnection, CRe
 }
 
 
+///////////////////////////////////////////////////////////////
+//
+// CDatabaseManagerImpl::QueryWithCallback
+//
+// Start a query and direct the result through a callback
+//
+///////////////////////////////////////////////////////////////
+bool CDatabaseManagerImpl::QueryWithCallback ( SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const SString& strQuery, CLuaArguments* pArgs )
+{
+    ClearLastErrorMessage ();
+
+    // Check connection
+    if ( !MapContains ( m_ConnectionTypeMap, hConnection ) )
+    {
+        SetLastErrorMessage ( "Invalid connection" );
+        return false;
+    }
+
+    // Insert arguments with correct escapement
+    SString strEscapedQuery = InsertQueryArguments ( hConnection, strQuery, pArgs );
+
+    // Start query
+    CDbJobData* pJobData = m_JobQueue->AddCommand ( EJobCommand::QUERY, hConnection, strEscapedQuery );
+    if ( !pJobData )
+    {
+        SetLastErrorMessage( "Invalid connection" );
+        return false;
+    }
+
+    // Set callback vars
+    pJobData->SetCallback ( pfnDbResult, pCallbackContext );
+
+    return true;
+}
+
+
 ///////////////////////////////////////////////////////////////
 //
 // CDatabaseManagerImpl::QueryWithCallbackf

Server/mods/deathmatch/logic/CDatabaseManager.h

@@ -150,18 +150,19 @@ class CDatabaseManager
     virtual void                    DoPulse                 ( void ) = 0;
     virtual SConnectionHandle       Connect                 ( const SString& strType, const SString& strHost, const SString& strUsername = "", const SString& strPassword = "", const SString& strOptions = "" ) = 0;
     virtual bool                    Disconnect              ( SConnectionHandle hConnection ) = 0;
-    virtual SString                 PrepareString           ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs ) = 0;
+    virtual SString                 PrepareString           ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr ) = 0;
     virtual SString                 PrepareStringf          ( SConnectionHandle hConnection, const char* szQuery, ... ) = 0;
-    virtual CDbJobData*             Exec                    ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs ) = 0;
+    virtual CDbJobData*             Exec                    ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr ) = 0;
     virtual CDbJobData*             Execf                   ( SConnectionHandle hConnection, const char* szQuery, ... ) = 0;
-    virtual CDbJobData*             QueryStart              ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs ) = 0;
+    virtual CDbJobData*             QueryStart              ( SConnectionHandle hConnection, const SString& strQuery, CLuaArguments* pArgs = nullptr ) = 0;
     virtual CDbJobData*             QueryStartf             ( SConnectionHandle hConnection, const char* szQuery, ... ) = 0;
     virtual bool                    QueryPoll               ( CDbJobData* pJobData, uint ulTimeout ) = 0;
     virtual bool                    QueryFree               ( CDbJobData* pJobData ) = 0;
     virtual CDbJobData*             GetQueryFromId          ( SDbJobId id ) = 0;
     virtual const SString&          GetLastErrorMessage     ( void ) = 0;
     virtual bool                    IsLastErrorSuppressed   ( void ) = 0;
     virtual bool                    QueryWithResultf        ( SConnectionHandle hConnection, CRegistryResult* pResult, const char* szQuery, ... ) = 0;
+    virtual bool                    QueryWithCallback       ( SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const SString& strQuery, CLuaArguments* pArgs = nullptr ) = 0;
     virtual bool                    QueryWithCallbackf      ( SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const char* szQuery, ... ) = 0;
     virtual void                    SetLogLevel             ( EJobLogLevelType logLevel, const SString& strLogFilename ) = 0;
 };