AxioDL
/
logvisor
mirror of https://github.com/AxioDL/logvisor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ConsoleLogger misusing Widen result lifetime

This commit is contained in:
Henrique Gemignani Passos Lima 2021-06-19 13:40:17 +03:00
parent ee3276d7c5
commit ed3714e55c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/logvisor.cpp
View File

@ -722,9 +722,9 @@ struct ConsoleLogger : public ILogger {
const double tmd = tm.count() * std::chrono::steady_clock::duration::period::num / const double tmd = tm.count() * std::chrono::steady_clock::duration::period::num /
static_cast<double>(std::chrono::steady_clock::duration::period::den); static_cast<double>(std::chrono::steady_clock::duration::period::den);
const std::thread::id thrId = std::this_thread::get_id(); const std::thread::id thrId = std::this_thread::get_id();
const wchar_t* thrName = nullptr; std::optional<std::wstring> thrName;
if (ThreadMap.find(thrId) != ThreadMap.end()) if (ThreadMap.find(thrId) != ThreadMap.end())
thrName = Widen(ThreadMap[thrId]).c_str(); thrName = Widen(ThreadMap[thrId]);
if (XtermColor) { if (XtermColor) {
std::fputws(W_BOLD L"[", stderr); std::fputws(W_BOLD L"[", stderr);
@ -752,7 +752,7 @@ struct ConsoleLogger : public ILogger {
if (sourceInfo) if (sourceInfo)
fmt::print(stderr, FMT_STRING(W_BOLD W_YELLOW L" {{}}"), sourceInfo); fmt::print(stderr, FMT_STRING(W_BOLD W_YELLOW L" {{}}"), sourceInfo);
if (thrName) if (thrName)
fmt::print(stderr, FMT_STRING(W_BOLD W_MAGENTA L" ({})"), thrName); fmt::print(stderr, FMT_STRING(W_BOLD W_MAGENTA L" ({})"), *thrName);
std::fputws(W_NORMAL W_BOLD L"] " W_NORMAL, stderr); std::fputws(W_NORMAL W_BOLD L"] " W_NORMAL, stderr);
} else { } else {
#if _WIN32 #if _WIN32
@ -791,7 +791,7 @@ struct ConsoleLogger : public ILogger {
fmt::print(stderr, FMT_STRING(L" {{}}"), sourceInfo); fmt::print(stderr, FMT_STRING(L" {{}}"), sourceInfo);
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE);
if (thrName) if (thrName)
fmt::print(stderr, FMT_STRING(L" ({})"), thrName); fmt::print(stderr, FMT_STRING(L" ({})"), *thrName);
SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE); SetConsoleTextAttribute(Term, FOREGROUND_INTENSITY | FOREGROUND_WHITE);
std::fputws(L"] ", stderr); std::fputws(L"] ", stderr);
SetConsoleTextAttribute(Term, FOREGROUND_WHITE); SetConsoleTextAttribute(Term, FOREGROUND_WHITE);