Fixed server crash when using db* functions during onDebugMessage event

ccw808 · ccw808 · commit 6605de4392d5 · 2016-07-03T19:34:25.000+01:00
diff --git a/MTA10_Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp b/MTA10_Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp
@@ -327,7 +327,9 @@ void CDatabaseJobQueueImpl::UpdateDebugData ( void )
             CTickCount age = timeNow - pJobData->result.timeReady;
             if ( age.ToLongLong () > 1000 * 60 * 5 )
             {
+                shared.m_Mutex.Unlock ();
                 g_pGame->GetScriptDebugging()->LogWarning( pJobData->m_LuaDebugInfo, "Database result uncollected after 5 minutes. [Query: %s]", *pJobData->command.strData );
+                shared.m_Mutex.Lock ();
                 pJobData->result.bLoggedWarning = true;
                 break;
             }
@@ -403,7 +405,9 @@ bool CDatabaseJobQueueImpl::PollCommand ( CDbJobData* pJobData, uint uiTimeout )
         // Issue warning if it's taking a long time
         if ( uiTotalWaitTime > uiWaitTimeWarnThresh )
         {
+            shared.m_Mutex.Unlock ();
             g_pGame->GetScriptDebugging()->LogWarning( pJobData->m_LuaDebugInfo, "dbPoll is waiting a long time (%d seconds so far). [Query: %s]", uiTotalWaitTime / 1000, *pJobData->command.strData );
+            shared.m_Mutex.Lock ();
             uiWaitTimeWarnThresh += TICKS_FROM_SECONDS( 60 );
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,9 @@ void CDatabaseJobQueueImpl::UpdateDebugData ( void )`
`327`	`327`	`CTickCount age = timeNow - pJobData->result.timeReady;`
`328`	`328`	`if ( age.ToLongLong () > 1000 * 60 * 5 )`
`329`	`329`	`{`
	`330`	`+ shared.m_Mutex.Unlock ();`
`330`	`331`	`g_pGame->GetScriptDebugging()->LogWarning( pJobData->m_LuaDebugInfo, "Database result uncollected after 5 minutes. [Query: %s]", *pJobData->command.strData );`
	`332`	`+ shared.m_Mutex.Lock ();`
`331`	`333`	`pJobData->result.bLoggedWarning = true;`
`332`	`334`	`break;`
`333`	`335`	`}`
`@@ -403,7 +405,9 @@ bool CDatabaseJobQueueImpl::PollCommand ( CDbJobData* pJobData, uint uiTimeout )`
`403`	`405`	`// Issue warning if it's taking a long time`
`404`	`406`	`if ( uiTotalWaitTime > uiWaitTimeWarnThresh )`
`405`	`407`	`{`
	`408`	`+ shared.m_Mutex.Unlock ();`
`406`	`409`	`g_pGame->GetScriptDebugging()->LogWarning( pJobData->m_LuaDebugInfo, "dbPoll is waiting a long time (%d seconds so far). [Query: %s]", uiTotalWaitTime / 1000, *pJobData->command.strData );`
	`410`	`+ shared.m_Mutex.Lock ();`
`407`	`411`	`uiWaitTimeWarnThresh += TICKS_FROM_SECONDS( 60 );`
`408`	`412`	`}`
`409`	`413`	`}`