tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Utility::ValidateUTF8(): move a string instead of copying a vector

Browse Source 
less malloc() = more speed

Especially as JsonEncode() validates every single input string.
This commit is contained in:
Alexander A. Klimov 2022-09-07 15:44:12 +02:00
parent 643e9cd48b
commit a6b36a2d7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/utility.cpp
View File

@ -1779,8 +1779,8 @@ const char l_Utf8Replacement[] = "\xEF\xBF\xBD";
String Utility::ValidateUTF8(const String& input) String Utility::ValidateUTF8(const String& input)
{ {
std::vector<char> output; std::string output;
output.reserve(input.GetLength() * 3u); output.reserve(input.GetLength());
try { try {
utf8::replace_invalid(input.Begin(), input.End(), std::back_inserter(output)); utf8::replace_invalid(input.Begin(), input.End(), std::back_inserter(output));
@ -1788,7 +1788,7 @@ String Utility::ValidateUTF8(const String& input)
output.insert(output.end(), (const char*)l_Utf8Replacement, (const char*)l_Utf8Replacement + 3); output.insert(output.end(), (const char*)l_Utf8Replacement, (const char*)l_Utf8Replacement + 3);
} }
return String(output.begin(), output.end()); return String(std::move(output));
} }
String Utility::CreateTempFile(const String& path, int mode, std::fstream& fp) String Utility::CreateTempFile(const String& path, int mode, std::fstream& fp)