eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

Logging memory leak fixes

Browse Source
This commit is contained in:
Hirek
2025-06-11 12:42:22 +02:00
parent a1510eb4fc
commit b0b7927212
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Logs.cpp
View File

@@ -72,8 +72,8 @@ std::string filename_scenery() {
} }
// log service stacks // log service stacks
std::deque<char *> InfoStack; std::deque<std::string> InfoStack;
std::deque<char *> ErrorStack; std::deque<std::string> ErrorStack;
void LogService() void LogService()
@@ -86,7 +86,7 @@ void LogService()
// --- Obsługa InfoStack --- // --- Obsługa InfoStack ---
while (!InfoStack.empty()) while (!InfoStack.empty())
{ {
char *msg = InfoStack.front(); std::string msg = InfoStack.front();
InfoStack.pop_front(); InfoStack.pop_front();
if (Global.iWriteLogEnabled & 1) if (Global.iWriteLogEnabled & 1)
@@ -109,27 +109,22 @@ void LogService()
#ifdef _WIN32 #ifdef _WIN32
SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN | FOREGROUND_INTENSITY); SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN | FOREGROUND_INTENSITY);
DWORD wr = 0; DWORD wr = 0;
WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), msg, (DWORD)strlen(msg), &wr, NULL); WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), msg.c_str(), (DWORD)msg.size(), &wr, NULL);
WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, (DWORD)strlen(endstring), &wr, NULL); WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, (DWORD)strlen(endstring), &wr, NULL);
#else #else
printf("%s\n", msg); printf("%s\n", msg.c_str());
#endif #endif
} }
free(msg); // cleanup po strdup
} }
// --- Obsługa ErrorStack --- // --- Obsługa ErrorStack ---
while (!ErrorStack.empty()) while (!ErrorStack.empty())
{ {
char *msg = ErrorStack.front(); std::string msg = ErrorStack.front();
ErrorStack.pop_front(); ErrorStack.pop_front();
if (!(Global.iWriteLogEnabled & 1)) if (!(Global.iWriteLogEnabled & 1))
{
free(msg);
continue; continue;
}
if (!errors.is_open()) if (!errors.is_open())
{ {
@@ -140,7 +135,6 @@ void LogService()
errors << msg << "\n"; errors << msg << "\n";
errors.flush(); errors.flush();
free(msg); // cleanup po strdup
} }
} }
@@ -148,19 +142,27 @@ void LogService()
} }
} }
void WriteLog( const char *str, logtype const Type ) {
if( str == nullptr ) { return; } void WriteLog(const char *str, logtype const Type)
if( true == TestFlag( Global.DisabledLogTypes, static_cast<unsigned int>( Type ) ) ) { return; } {
InfoStack.emplace_back(strdup(str)); if (!str || *str == '\0')
return;
if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type)))
return;
InfoStack.emplace_back(str);
} }
void ErrorLog( const char *str, logtype const Type ) { void ErrorLog(const char *str, logtype const Type)
{
if (!str || *str == '\0')
return;
if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type)))
return;
ErrorStack.emplace_back(str);
}
if( str == nullptr ) { return; }
if( true == TestFlag( Global.DisabledLogTypes, static_cast<unsigned int>( Type ) ) ) { return; }
ErrorStack.emplace_back(strdup(str));
};
void Error(const std::string &asMessage, bool box) void Error(const std::string &asMessage, bool box)
{ {