Return std::string from Membership::GetAllPrefixChars()

2 files changed, 5 insertions, 8 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index a757cdc5a..49fa75f98 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -611,20 +611,17 @@ unsigned int Membership::getRank()
 	return rv;
 }
 
-const char* Membership::GetAllPrefixChars() const
+std::string Membership::GetAllPrefixChars() const
 {
-	static char prefix[64];
-	int ctr = 0;
-
+	std::string ret;
 	for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
 	{
 		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
 		if (mh && mh->GetPrefix())
-			prefix[ctr++] = mh->GetPrefix();
+			ret.push_back(mh->GetPrefix());
 	}
-	prefix[ctr] = 0;
 
-	return prefix;
+	return ret;
 }
 
 unsigned int Channel::GetPrefixValue(User* user)
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 4330f410d..f4123466e 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -264,7 +264,7 @@ class CommandCheck : public Command
 			 	 */
 				const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first);
 				context.Write("member", InspIRCd::Format("%-3u %s%s (%s@%s) %s ", clonecount.global,
-					i->second->GetAllPrefixChars(), i->first->nick.c_str(),
+					i->second->GetAllPrefixChars().c_str(), i->first->nick.c_str(),
 					i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str()));
 			}