diff options
| author |  brain | 2006-08-27 00:45:16 +0000 |
|---|---|---|
| committer | brain | 2006-08-27 00:45:16 +0000 |
| commit | 23620ed51a7d8c4694652cdf92c76dc278c8795f (patch) | |
| tree | 5a975cd7b0e99e701c8c9760c9610645a01a9eaa /src/modules/m_spanningtree.cpp | |
| parent | Poor old Ian Gulliver :p Finally got his credit here (diff) | |
Backport NULL check in this module from trunk
git-svn-id: http://svn.inspircd.org/repository/branches/1_0_stable@5028 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree.cpp')
| -rw-r--r-- | src/modules/m_spanningtree.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index f5e8214a6..7a9594d56 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -2752,7 +2752,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref for (unsigned int x = 0; x < items; x++) { TreeServer* Route = TreeRoot->GetChild(x); - if ((Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) + if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) { TreeSocket* Sock = Route->GetSocket(); Sock->WriteLine(data); @@ -2778,7 +2778,7 @@ bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std // The route has a socket (its a direct connection) // The route isnt the one to be omitted // The route isnt the path to the one to be omitted - if ((Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) + if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) { TreeSocket* Sock = Route->GetSocket(); Sock->WriteLine(FullLine); @@ -2799,7 +2799,7 @@ bool DoOneToMany(std::string prefix, std::string command, std::deque<std::string for (unsigned int x = 0; x < items; x++) { TreeServer* Route = TreeRoot->GetChild(x); - if (Route->GetSocket()) + if (Route && Route->GetSocket()) { TreeSocket* Sock = Route->GetSocket(); Sock->WriteLine(FullLine); @@ -2819,7 +2819,7 @@ bool DoOneToOne(std::string prefix, std::string command, std::deque<std::string> { FullLine = FullLine + " " + params[x]; } - if (Route->GetSocket()) + if (Route && Route->GetSocket()) { TreeSocket* Sock = Route->GetSocket(); Sock->WriteLine(FullLine); |