Merge branch 'master' into master

pull/3894/head
Carsten Rudolph 2021-05-27 09:45:17 +02:00 committed by GitHub
commit 0905252833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

View File

@ -169,7 +169,7 @@ void Logger::debug(const char *message) {
// sometimes importers will include data from the input file // sometimes importers will include data from the input file
// (i.e. node names) in their messages. // (i.e. node names) in their messages.
if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return OnDebug("<fixme: long message discarded>");
} }
return OnDebug(message); return OnDebug(message);
} }
@ -179,7 +179,7 @@ void Logger::verboseDebug(const char *message) {
// SECURITY FIX: see above // SECURITY FIX: see above
if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return OnVerboseDebug("<fixme: long message discarded>");
} }
return OnVerboseDebug(message); return OnVerboseDebug(message);
} }
@ -189,7 +189,7 @@ void Logger::info(const char *message) {
// SECURITY FIX: see above // SECURITY FIX: see above
if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return OnInfo("<fixme: long message discarded>");
} }
return OnInfo(message); return OnInfo(message);
} }
@ -199,7 +199,7 @@ void Logger::warn(const char *message) {
// SECURITY FIX: see above // SECURITY FIX: see above
if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return OnWarn("<fixme: long message discarded>");
} }
return OnWarn(message); return OnWarn(message);
} }
@ -208,7 +208,7 @@ void Logger::warn(const char *message) {
void Logger::error(const char *message) { void Logger::error(const char *message) {
// SECURITY FIX: see above // SECURITY FIX: see above
if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return OnError("<fixme: long message discarded>");
} }
return OnError(message); return OnError(message);
} }