X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=f8ee0d1a65f568d5ddc9629be5a0366b51817bee;hb=6214094a84f33ea80af4dac88dd1b82bd59a0b5c;hp=b1692e6d1ea9d6dcad034e750313391c9c4ef817;hpb=4f9abe96a4301a740d4a5fd7932550d88d60a3fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index b1692e6d1..f8ee0d1a6 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1,12 +1,12 @@
 /*
  * 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>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2012-2014, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -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.