hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-29 16:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix memory issues with logs

Browse source
This commit is contained in:
vaxerski 2022-05-24 17:20:40 +02:00
parent f522c597ef
commit d8d8a29fc2
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/debug/Log.cpp
View file

@ -5,8 +5,6 @@
#include <iostream> #include <iostream>
void Debug::log(LogLevel level, const char* fmt, ...) { void Debug::log(LogLevel level, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
// log to a file // log to a file
const std::string DEBUGPATH = ISDEBUG ? "/tmp/hypr/hyprlandd.log" : "/tmp/hypr/hyprland.log"; const std::string DEBUGPATH = ISDEBUG ? "/tmp/hypr/hyprlandd.log" : "/tmp/hypr/hyprland.log";
@ -31,15 +29,36 @@ void Debug::log(LogLevel level, const char* fmt, ...) {
} }
char buf[LOGMESSAGESIZE] = ""; char buf[LOGMESSAGESIZE] = "";
char* outputStr;
int logLen;
vsprintf(buf, fmt, args); va_list args;
va_start(args, fmt);
logLen = vsnprintf(buf, sizeof buf, fmt, args);
va_end(args);
ofs << buf << "\n"; if ((long unsigned int)logLen < sizeof buf) {
outputStr = strdup(buf);
} else {
outputStr = (char*)malloc(logLen + 1);
if (!outputStr) {
printf("CRITICAL: Cannot alloc size %d for log! (Out of memory?)", logLen + 1);
return;
}
va_start(args, fmt);
vsnprintf(outputStr, logLen + 1U, fmt, args);
va_end(args);
}
ofs << outputStr << "\n";
ofs.close(); ofs.close();
// log it to the stdout too. // log it to the stdout too.
std::cout << buf << "\n"; std::cout << outputStr << "\n";
va_end(args); // free the log
free(outputStr);
} }