ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a crash when logging long messages

Browse Source
This commit is contained in:
Deve 2018-02-12 21:31:32 +01:00
parent 000b613b8b
commit 4cc57dd754
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/utils/log.cpp
View File

@ -138,16 +138,25 @@ void Log::printMessage(int level, const char *component, const char *format,
static const char *names[] = { "debug", "verbose ", "info ", static const char *names[] = { "debug", "verbose ", "info ",
"warn ", "error ", "fatal " }; "warn ", "error ", "fatal " };
const int MAX_LENGTH = 2048; const int MAX_LENGTH = 4096;
char line[MAX_LENGTH + 1]; char line[MAX_LENGTH + 1];
int index = 0; int index = 0;
if (!m_prefix.empty()) int remaining = MAX_LENGTH;
index += snprintf(line+index, MAX_LENGTH-index, "%s ", m_prefix.c_str());
index += snprintf (line + index, MAX_LENGTH - index, "[%s] %s: ", names[level], component); if (!m_prefix.empty())
index += vsnprintf(line + index, MAX_LENGTH - index, format, args); {
index += snprintf(line+index, remaining, "%s ", m_prefix.c_str());
remaining = MAX_LENGTH - index > 0 ? MAX_LENGTH - index : 0;
}
index += snprintf (line + index, remaining, "[%s] %s: ", names[level], component);
remaining = MAX_LENGTH - index > 0 ? MAX_LENGTH - index : 0;
index += vsnprintf(line + index, remaining, format, args);
remaining = MAX_LENGTH - index > 0 ? MAX_LENGTH - index : 0;
va_end(args); va_end(args);
index = snprintf (line + index, MAX_LENGTH - index, "\n");
index = index > MAX_LENGTH - 1 ? MAX_LENGTH - 1 : index;
sprintf(line + index, "\n");
// If the data is not buffered, immediately print it: // If the data is not buffered, immediately print it:
if (m_buffer_size <= 1) if (m_buffer_size <= 1)