aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/treesocket2.cpp
diff options
context:
space:
mode:
authorGravatar danieldg2009-05-13 05:28:00 +0000
committerGravatar danieldg2009-05-13 05:28:00 +0000
commita889336d194abc7df7a98102e3d0e56f0e125edc (patch)
treec41cd85106841964c55782a74bc973d3d0fe94d4 /src/modules/m_spanningtree/treesocket2.cpp
parentReplace loopCall detection in OnUserKick with a check for the m_spanningtree ... (diff)
Make the previous patches actually work
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11378 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree/treesocket2.cpp')
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 9f99a7416..68b5a7840 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -299,8 +299,10 @@ bool TreeSocket::ProcessLine(std::string &line)
TreeServer *ServerSource = Utils->FindServer(prefix);
if (ServerSource)
{
- Utils->ServerUser->server = ServerSource->GetName().c_str();
- Utils->ServerUser->uid = ServerSource->GetID();
+ // ServerSource->GetName().c_str() may become invalid before it is used
+ Utils->ServerUser->nick = ServerSource->GetName().c_str();
+ Utils->ServerUser->server = Utils->ServerUser->nick.c_str();
+ Utils->ServerUser->uuid = ServerSource->GetID();
}
/* Find the link we just got this from so we don't bounce it back incorrectly */