flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Eliminate race condition in cRoot::FindAndDoWithPlayer

Browse Source 
Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer.
This commit is contained in:
worktycho 2015-04-24 12:45:44 +01:00
parent 0bfcd62556
commit 20593dcb35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Root.cpp
View File

@ -607,7 +607,7 @@ bool cRoot::FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallbac
size_t Rating = RateCompareString (m_PlayerName, a_pPlayer->GetName()); size_t Rating = RateCompareString (m_PlayerName, a_pPlayer->GetName());
if ((Rating > 0) && (Rating >= m_BestRating)) if ((Rating > 0) && (Rating >= m_BestRating))
{ {
m_BestMatch = a_pPlayer; m_BestMatch = a_pPlayer->GetName();
if (Rating > m_BestRating) if (Rating > m_BestRating)
{ {
m_NumMatches = 0; m_NumMatches = 0;
@ -627,18 +627,18 @@ bool cRoot::FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallbac
m_BestRating(0), m_BestRating(0),
m_NameLength(a_PlayerName.length()), m_NameLength(a_PlayerName.length()),
m_PlayerName(a_PlayerName), m_PlayerName(a_PlayerName),
m_BestMatch(nullptr), m_BestMatch(),
m_NumMatches(0) m_NumMatches(0)
{} {}
cPlayer * m_BestMatch; AString m_BestMatch;
unsigned m_NumMatches; unsigned m_NumMatches;
} Callback (a_PlayerName); } Callback (a_PlayerName);
ForEachPlayer(Callback); ForEachPlayer(Callback);
if (Callback.m_NumMatches == 1) if (Callback.m_NumMatches == 1)
{ {
return a_Callback.Item(Callback.m_BestMatch); return DoWithPlayer(Callback.m_BestMatch, a_Callback);
} }
return false; return false;
} }