From a889336d194abc7df7a98102e3d0e56f0e125edc Mon Sep 17 00:00:00 2001
From: danieldg
Date: Wed, 13 May 2009 05:28:00 +0000
Subject: Make the previous patches actually work

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11378 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_spanningtree/treesocket2.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_spanningtree/treesocket2.cpp')

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 */
-- 
cgit v1.3.1-10-gc9f91