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

Fast path for unformatted calls.

pull/3905/head
Malcolm Tyrrell 2021-05-17 11:27:21 +01:00
parent fd5d1211f9
commit 084dc73b91
2 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
code/Common/DefaultLogger.cpp
View File

@ -163,55 +163,54 @@ Logger *DefaultLogger::create(const char *name /*= "AssimpLog.txt"*/,
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::debugInternal(Assimp::Formatter::format f) { void Logger::debug(const char *message) {
std::string message = f;
// SECURITY FIX: otherwise it's easy to produce overruns since // SECURITY FIX: otherwise it's easy to produce overruns since
// 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 (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return;
} }
return OnDebug(message.c_str()); return OnDebug(message);
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::verboseDebugInternal(Assimp::Formatter::format f) { void Logger::verboseDebug(const char *message) {
std::string message = f;
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return;
} }
return OnVerboseDebug(message.c_str()); return OnVerboseDebug(message);
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::infoInternal(Assimp::Formatter::format f) { void Logger::info(const char *message) {
std::string message = f;
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return;
} }
return OnInfo(message.c_str()); return OnInfo(message);
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::warnInternal(Assimp::Formatter::format f) { void Logger::warn(const char *message) {
std::string message = f;
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return;
} }
return OnWarn(message.c_str()); return OnWarn(message);
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
void Logger::errorInternal(Assimp::Formatter::format f) { void Logger::error(const char *message) {
std::string message = f;
// SECURITY FIX: see above // SECURITY FIX: see above
if (message.length() > MAX_LOG_MESSAGE_LENGTH) { if (strlen(message) > MAX_LOG_MESSAGE_LENGTH) {
return; return;
} }
return OnError(message.c_str()); return OnError(message);
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------

69
include/assimp/Logger.hpp
View File

@ -101,41 +101,51 @@ public:
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/** @brief Writes a info message /** @brief Writes a info message
* @param message Info message*/ * @param message Info message*/
void debug(const char* message);
template<typename... T> template<typename... T>
void debug(T&&... args) { void debug(T&&... args) {
debugInternal(Assimp::Formatter::format(), std::forward<T>(args)...); debugFormat(Assimp::Formatter::format(), std::forward<T>(args)...);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/** @brief Writes a debug message /** @brief Writes a debug message
* @param message Debug message*/ * @param message Debug message*/
void verboseDebug(const char* message);
template<typename... T> template<typename... T>
void verboseDebug(T&&... args) { void verboseDebug(T&&... args) {
verboseDebugInternal(Assimp::Formatter::format(), std::forward<T>(args)...); verboseDebugFormat(Assimp::Formatter::format(), std::forward<T>(args)...);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/** @brief Writes a info message /** @brief Writes a info message
* @param message Info message*/ * @param message Info message*/
void info(const char* message);
template<typename... T> template<typename... T>
void info(T&&... args) { void info(T&&... args) {
infoInternal(Assimp::Formatter::format(), std::forward<T>(args)...); infoFormat(Assimp::Formatter::format(), std::forward<T>(args)...);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/** @brief Writes a warning message /** @brief Writes a warning message
* @param message Warn message*/ * @param message Warn message*/
void warn(const char* message);
template<typename... T> template<typename... T>
void warn(T&&... args) { void warn(T&&... args) {
warnInternal(Assimp::Formatter::format(), std::forward<T>(args)...); warnFormat(Assimp::Formatter::format(), std::forward<T>(args)...);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/** @brief Writes an error message /** @brief Writes an error message
* @param message Info message*/ * @param message Info message*/
void error(const char* message);
template<typename... T> template<typename... T>
void error(T&&... args) { void error(T&&... args) {
errorInternal(Assimp::Formatter::format(), std::forward<T>(args)...); errorFormat(Assimp::Formatter::format(), std::forward<T>(args)...);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@ -236,36 +246,49 @@ protected:
virtual void OnError(const char* message) = 0; virtual void OnError(const char* message) = 0;
protected: protected:
void debugFormat(Assimp::Formatter::format f) {
void debugInternal(Assimp::Formatter::format f); debug(std::string(f).c_str());
void verboseDebugInternal(Assimp::Formatter::format f);
void warnInternal(Assimp::Formatter::format f);
void infoInternal(Assimp::Formatter::format f);
void errorInternal(Assimp::Formatter::format f);
template<typename... T, typename U>
void debugInternal(Assimp::Formatter::format f, U&& u, T&&... args) {
debugInternal(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
} }
template<typename... T, typename U> template<typename... T, typename U>
void verboseDebugInternal(Assimp::Formatter::format f, U&& u, T&&... args) { void debugFormat(Assimp::Formatter::format f, U&& u, T&&... args) {
verboseDebugInternal(std::move(f << std::forward<U>(u)), std::forward<T>(args)...); debugFormat(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
}
void verboseDebugFormat(Assimp::Formatter::format f) {
verboseDebug(std::string(f).c_str());
} }
template<typename... T, typename U> template<typename... T, typename U>
void warnInternal(Assimp::Formatter::format f, U&& u, T&&... args) { void verboseDebugFormat(Assimp::Formatter::format f, U&& u, T&&... args) {
warnInternal(std::move(f << std::forward<U>(u)), std::forward<T>(args)...); verboseDebugFormat(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
}
void warnFormat(Assimp::Formatter::format f) {
warn(std::string(f).c_str());
} }
template<typename... T, typename U> template<typename... T, typename U>
void infoInternal(Assimp::Formatter::format f, U&& u, T&&... args) { void warnFormat(Assimp::Formatter::format f, U&& u, T&&... args) {
infoInternal(std::move(f << std::forward<U>(u)), std::forward<T>(args)...); warnFormat(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
}
void infoFormat(Assimp::Formatter::format f) {
info(std::string(f).c_str());
} }
template<typename... T, typename U> template<typename... T, typename U>
void errorInternal(Assimp::Formatter::format f, U&& u, T&&... args) { void infoFormat(Assimp::Formatter::format f, U&& u, T&&... args) {
errorInternal(std::move(f << std::forward<U>(u)), std::forward<T>(args)...); infoFormat(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
}
void errorFormat(Assimp::Formatter::format f) {
error(std::string(f).c_str());
}
template<typename... T, typename U>
void errorFormat(Assimp::Formatter::format f, U&& u, T&&... args) {
errorFormat(std::move(f << std::forward<U>(u)), std::forward<T>(args)...);
} }
protected: protected: