ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 03:59:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some logging/preventative code for Jason's issue.. it shouldn't crash now (fingers crossed) if it tries to do something naughty, but it will log about it instead. I know this is buttfucked code, but it's highly temporary.

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9762 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2008-05-19 10:27:34 +00:00
parent 2df1a3de45
commit 110d053f8c
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/cull_list.cpp
View File

@ -117,18 +117,45 @@ int CullList::Apply()
u->AddToWhoWas();
}
bool deleteu = true;
if (iter != ServerInstance->Users->clientlist->end())
{
if (IS_LOCAL(u))
{
std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
if (x != ServerInstance->Users->local_users.end())
ServerInstance->Users->local_users.erase(x);
}
ServerInstance->Users->clientlist->erase(iter);
}
else
{
/*
* Trying to track down Jason's issue.. this should never happen obviously.
*/
ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic?");
// deleteu = false;
// actually, delete them anyway.. the local vector is the real problem here
}
if (IS_LOCAL(u))
{
std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
if (x != ServerInstance->Users->local_users.end())
ServerInstance->Users->local_users.erase(x);
else
{
/*
* This code is in here to monitor an issue of Jason's, where it seems to be trying to quit already quit users.
* The only way that can happen is if this find fails, so log it just in case.
* Also, (perhaps incorrectly, but oh well), return here so we don't delete the user and then start trampling
* on deleted memory, which leads to big problems..
*/
ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector, we're all gonna die!!! Not deleting the user to save our sanity");
deleteu = false;
}
}
if (deleteu)
{
delete u;
}
delete u;
list.erase(list.begin());
}