Refactor GenRandomStr for performance and readability.

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 64fadc015dc05c2cde96d25c21e31136b729bebb..ed1e304b5a82578c81ef70eacfe478acc0be3b93 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -517,14 +517,12 @@ std::string InspIRCd::TimeString(time_t curtime, const char* format, bool utc)
 
 std::string InspIRCd::GenRandomStr(unsigned int length, bool printable)
 {
-       char* buf = new char[length];
-       GenRandom(buf, length);
-       std::string rv;
-       rv.resize(length);
-       for(size_t i = 0; i < length; i++)
-               rv[i] = printable ? 0x3F + (buf[i] & 0x3F) : buf[i];
-       delete[] buf;
-       return rv;
+       std::vector<char> str(length);
+       GenRandom(&str[0], length);
+       if (printable)
+               for (size_t i = 0; i < length; i++)
+                       str[i] = 0x3F + (str[i] & 0x3F);
+       return std::string(&str[0], str.size());
 }
 
 // NOTE: this has a slight bias for lower values if max is not a power of 2.