Strlen bashing.

[user/henk/code/inspircd.git] / src / cull_list.cpp

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index a6dd915a29db503184264ce7cdaf9eedff5050da..224a9e3da0b55fc9792aec1f314f54a570bcbc82 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -54,11 +54,29 @@ extern user_hash clientlist;
 
 bool CullList::IsValid(userrec* user)
 {
+       time_t esignon = 0;
+       std::map<userrec*,time_t>::iterator es = exempt.find(user);
+       if (es != exempt.end())
+               esignon = es->second;
+
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               userrec* u2 = (userrec*)*u;
-               if (user == u2)
-                       return true;
+               /*
+                * BUGFIX
+                *
+                * Because there is an undetermined period of time between a user existing,
+                * and this function being called, we have to check for the following condition:
+                *
+                * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called,
+                * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO
+                * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we
+                * cross reference each pointer to the user's signon time, and if the signon times
+                * do not match, we return false here to indicate this user is NOT valid as it
+                * seems to differ from the pointer snapshot we got a few seconds earlier. Should
+                * prevent a few random crashes during netsplits.
+                */
+               if (user == u->second)
+                       return (u->second->signon == esignon);
        }
        return false;
 }
@@ -91,8 +109,7 @@ void CullList::AddItem(userrec* user, std::string reason)
        {
                CullItem item(user,reason);
                list.push_back(item);
-               names.push_back(user->nick);
-               exempt[user] = 1;
+               exempt[user] = user->signon;
        }
 }