Fix the behaviour of multi-value PING and PONG messages.

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index e019a660bc7871e1d08189251d7169ed30085f89..ed1e304b5a82578c81ef70eacfe478acc0be3b93 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2019-2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
@@ -383,7 +383,7 @@ bool InspIRCd::Duration(const std::string& str, unsigned long& duration)
                }
                else
                {
-                       /* Found something thats not a number, find out how much
+                       /* Found something that's not a number, find out how much
                         * it multiplies the built up number by, multiply the total
                         * and reset the built up number.
                         */
@@ -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.