UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport some clientprefs crash fixes from 1.6.

Browse Source
This commit is contained in:
Asher Baker 2013-03-18 18:54:00 +00:00
parent eaef2a46fb
commit d315d4bf53
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/clientprefs/cookie.cpp
View File

@ -215,53 +215,35 @@ void CookieManager::OnClientDisconnecting(int client)
SourceHook::List<CookieData *>::iterator _iter; SourceHook::List<CookieData *>::iterator _iter;
CookieData *current; CookieData *current;
IGamePlayer *player = playerhelpers->GetGamePlayer(client);
const char *pAuth = player ? player->GetAuthString() : NULL;
int dbId;
_iter = clientData[client].begin(); for (SourceHook::List<CookieData *>::iterator _iter = clientData[client].begin(); _iter != clientData[client].end(); _iter++)
while (_iter != clientData[client].end())
{ {
current = (CookieData *)*_iter; current = (CookieData *)*_iter;
dbId = current->parent->dbid;
if (!current->changed) if (player == NULL || pAuth == NULL || !current->changed || dbId == -1)
{ {
current->parent->data[client] = NULL; current->parent->data[client] = NULL;
delete current; delete current;
_iter = clientData[client].erase(_iter);
continue; continue;
} }
/* Save this cookie to the database */
IGamePlayer *player = playerhelpers->GetGamePlayer(client);
if (player == NULL)
{
/* panic! */
return;
}
int dbId = current->parent->dbid;
if (dbId == -1)
{
/* Insert/Find Query must be still running or failed. */
return;
}
TQueryOp *op = new TQueryOp(Query_InsertData, client); TQueryOp *op = new TQueryOp(Query_InsertData, client);
strcpy(op->m_params.steamId, player->GetAuthString()); strcpy(op->m_params.steamId, pAuth);
op->m_params.cookieId = dbId; op->m_params.cookieId = dbId;
op->m_params.data = current; op->m_params.data = current;
g_ClientPrefs.AddQueryToQueue(op); g_ClientPrefs.AddQueryToQueue(op);
current->parent->data[client] = NULL; current->parent->data[client] = NULL;
/* We don't delete here, it will be removed when the query is completed */
_iter = clientData[client].erase(_iter);
} }
clientData[client].clear();
} }
void CookieManager::ClientConnectCallback(int serial, IQuery *data) void CookieManager::ClientConnectCallback(int serial, IQuery *data)

2
extensions/clientprefs/extension.cpp
View File

@ -201,8 +201,6 @@ void ClientPrefs::SDK_OnUnload()
phrases->Destroy(); phrases->Destroy();
sharesys->DestroyIdentity( identity );
plsys->RemovePluginsListener(&g_CookieManager); plsys->RemovePluginsListener(&g_CookieManager);
playerhelpers->RemoveClientListener(&g_CookieManager); playerhelpers->RemoveClientListener(&g_CookieManager);