From 1d4efe298691a42cba3b6084805feb977075f898 Mon Sep 17 00:00:00 2001 From: Warpten Date: Sat, 27 Oct 2018 22:14:37 +0200 Subject: Fix invalid arguments to string format in Trinity::Fatal Isn't whatever is used nowadays to make this stuff safe supposed to prevent this sort of stuff? (cherry picked from commit 9bf69b3849a9d78f3e8d174ed6367a259aaf876f) --- src/common/Debugging/Errors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/Debugging/Errors.cpp') diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp index 0ee53611874..9f832caff4d 100644 --- a/src/common/Debugging/Errors.cpp +++ b/src/common/Debugging/Errors.cpp @@ -95,7 +95,7 @@ void Fatal(char const* file, int line, char const* function, char const* message va_list args; va_start(args, message); - std::string formattedMessage = StringFormat("\n%s:%i in %s FATAL ERROR:\n %s\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; + std::string formattedMessage = StringFormat("\n%s:%i in %s FATAL ERROR:\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; va_end(args); fprintf(stderr, "%s", formattedMessage.c_str()); -- cgit v1.2.3