X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=e331ba9dc6c9b2bf980df1ba1607dd94602c5b01;hb=48a400f2e068527b338ceecf8ed1dde2da971ca9;hp=b80a3897c49abc12fc82f57be648bb14f07875ed;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index b80a3897c..e331ba9dc 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -101,7 +101,7 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 	if (exclamation != 1 || atsign != 1)
 		return false;
 
-	if (mask.length() > 250)
+	if (mask.length() > ServerInstance->Config->Limits.GetMaxMask())
 		return false;
 
 	return true;
@@ -331,7 +331,7 @@ unsigned long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-const char* InspIRCd::Format(va_list &vaList, const char* formatString)
+std::string InspIRCd::Format(va_list& vaList, const char* formatString)
 {
 	static std::vector<char> formatBuffer(1024);
 
@@ -351,12 +351,12 @@ const char* InspIRCd::Format(va_list &vaList, const char* formatString)
 		formatBuffer.resize(formatBuffer.size() * 2);
 	}
 
-	return &formatBuffer[0];
+	return std::string(&formatBuffer[0]);
 }
 
-const char* InspIRCd::Format(const char* formatString, ...)
+std::string InspIRCd::Format(const char* formatString, ...)
 {
-	const char* ret;
+	std::string ret;
 	VAFORMAT(ret, formatString, formatString);
 	return ret;
 }