From 6e4b9d267bbf69f3e9f054f5d1f4b237ced578cf Mon Sep 17 00:00:00 2001 From: Malcolm Tyrrell Date: Mon, 17 May 2021 10:29:06 +0100 Subject: [PATCH] Remove TODO. Typo fix. --- code/AssetLib/AC/ACLoader.cpp | 2 +- code/Common/DefaultLogger.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/AssetLib/AC/ACLoader.cpp b/code/AssetLib/AC/ACLoader.cpp index 974e77825..078c96e32 100644 --- a/code/AssetLib/AC/ACLoader.cpp +++ b/code/AssetLib/AC/ACLoader.cpp @@ -116,7 +116,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name buffer = AcSkipToNextToken(buffer); if (0 != name_length) { if (0 != strncmp(buffer, name, name_length) || !IsSpace(buffer[name_length])) { - ASSIMP_LOG_ERROR("AC3D: Unexpexted token. " + std::string(name) + " was expected."); + ASSIMP_LOG_ERROR("AC3D: Unexpected token. ", name, " was expected."); return buffer; } buffer += name_length + 1; diff --git a/code/Common/DefaultLogger.cpp b/code/Common/DefaultLogger.cpp index e12276ea9..253cae47b 100644 --- a/code/Common/DefaultLogger.cpp +++ b/code/Common/DefaultLogger.cpp @@ -165,7 +165,6 @@ Logger *DefaultLogger::create(const char *name /*= "AssimpLog.txt"*/, // ---------------------------------------------------------------------------------- void Logger::debugInternal(Assimp::Formatter::format f) { std::string message = f; - // TODO: Should limit sizes in the formatter. // SECURITY FIX: see above if (message.length() > MAX_LOG_MESSAGE_LENGTH) { return; @@ -176,7 +175,6 @@ void Logger::debugInternal(Assimp::Formatter::format f) { // ---------------------------------------------------------------------------------- void Logger::verboseDebugInternal(Assimp::Formatter::format f) { std::string message = f; - // TODO: Should limit sizes in the formatter. // SECURITY FIX: see above if (message.length() > MAX_LOG_MESSAGE_LENGTH) { return; @@ -187,7 +185,6 @@ void Logger::verboseDebugInternal(Assimp::Formatter::format f) { // ---------------------------------------------------------------------------------- void Logger::infoInternal(Assimp::Formatter::format f) { std::string message = f; - // TODO: Should limit sizes in the formatter. // SECURITY FIX: see above if (message.length() > MAX_LOG_MESSAGE_LENGTH) { return; @@ -198,7 +195,6 @@ void Logger::infoInternal(Assimp::Formatter::format f) { // ---------------------------------------------------------------------------------- void Logger::warnInternal(Assimp::Formatter::format f) { std::string message = f; - // TODO: Should limit sizes in the formatter. // SECURITY FIX: see above if (message.length() > MAX_LOG_MESSAGE_LENGTH) { return; @@ -209,7 +205,6 @@ void Logger::warnInternal(Assimp::Formatter::format f) { // ---------------------------------------------------------------------------------- void Logger::errorInternal(Assimp::Formatter::format f) { std::string message = f; - // TODO: Should limit sizes in the formatter. // SECURITY FIX: see above if (message.length() > MAX_LOG_MESSAGE_LENGTH) { return;