v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove TODO. Typo fix.

pull/3905/head
Malcolm Tyrrell 2021-05-17 10:29:06 +01:00
parent 4ec01cfdcd
commit 6e4b9d267b
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/AC/ACLoader.cpp
View File

@ -116,7 +116,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name
buffer = AcSkipToNextToken(buffer); buffer = AcSkipToNextToken(buffer);
if (0 != name_length) { if (0 != name_length) {
if (0 != strncmp(buffer, name, name_length) || !IsSpace(buffer[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; return buffer;
} }
buffer += name_length + 1; buffer += name_length + 1;

5
code/Common/DefaultLogger.cpp
View File

@ -165,7 +165,6 @@ Logger *DefaultLogger::create(const char *name /*= "AssimpLog.txt"*/,
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::debugInternal(Assimp::Formatter::format f) { void Logger::debugInternal(Assimp::Formatter::format f) {
std::string message = f; std::string message = f;
// TODO: Should limit sizes in the formatter.
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (message.length() > MAX_LOG_MESSAGE_LENGTH) {
return; return;
@ -176,7 +175,6 @@ void Logger::debugInternal(Assimp::Formatter::format f) {
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::verboseDebugInternal(Assimp::Formatter::format f) { void Logger::verboseDebugInternal(Assimp::Formatter::format f) {
std::string message = f; std::string message = f;
// TODO: Should limit sizes in the formatter.
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (message.length() > MAX_LOG_MESSAGE_LENGTH) {
return; return;
@ -187,7 +185,6 @@ void Logger::verboseDebugInternal(Assimp::Formatter::format f) {
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::infoInternal(Assimp::Formatter::format f) { void Logger::infoInternal(Assimp::Formatter::format f) {
std::string message = f; std::string message = f;
// TODO: Should limit sizes in the formatter.
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (message.length() > MAX_LOG_MESSAGE_LENGTH) {
return; return;
@ -198,7 +195,6 @@ void Logger::infoInternal(Assimp::Formatter::format f) {
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::warnInternal(Assimp::Formatter::format f) { void Logger::warnInternal(Assimp::Formatter::format f) {
std::string message = f; std::string message = f;
// TODO: Should limit sizes in the formatter.
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (message.length() > MAX_LOG_MESSAGE_LENGTH) {
return; return;
@ -209,7 +205,6 @@ void Logger::warnInternal(Assimp::Formatter::format f) {
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::errorInternal(Assimp::Formatter::format f) { void Logger::errorInternal(Assimp::Formatter::format f) {
std::string message = f; std::string message = f;
// TODO: Should limit sizes in the formatter.
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (message.length() > MAX_LOG_MESSAGE_LENGTH) {
return; return;