Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Console: Fix uninitialized variable

Browse Source 
(cherry picked from commit 677952fbc5)
This commit is contained in:
Shauren
2021-04-13 23:27:49 +02:00
parent 8897151ffb
commit b1f231452b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/Utilities/Util.cpp
View File

@@ -442,7 +442,7 @@ bool WStrToUtf8(std::wstring_view wstr, std::string& utf8str)
std::string utf8str2;
utf8str2.resize(wstr.size()*4); // allocate for most long case
if (wstr.size())
if (!wstr.empty())
{
char* oend = utf8::utf16to8(wstr.begin(), wstr.end(), &utf8str2[0]);
utf8str2.resize(oend-(&utf8str2[0])); // remove unused tail
@@ -790,9 +790,9 @@ bool ReadWinConsole(std::string& str, size_t size /*= 256*/)
{
wchar_t* commandbuf = new wchar_t[size + 1];
HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE);
DWORD read;
DWORD read = 0;
if (!ReadConsoleW(hConsole, commandbuf, size, &read, NULL))
if (!ReadConsoleW(hConsole, commandbuf, size, &read, nullptr))
{
delete[] commandbuf;
return false;
@@ -815,7 +815,7 @@ bool WriteWinConsole(std::string_view str, bool error /*= false*/)
DWORD toWrite = wstr.size();
DWORD write;
return WriteConsoleW(hConsole, wstr.c_str(), wstr.size(), &write, NULL);
return WriteConsoleW(hConsole, wstr.c_str(), wstr.size(), &write, nullptr);
}
#endif