From fc6b488620282620eada92a6615643cdc9c5411f Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 16 Jul 2017 18:16:48 +0200 Subject: Core/Misc: Fix static analysis issues # Conflicts: # src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp # src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp # src/server/game/Entities/Unit/Unit.cpp # src/server/scripts/Commands/cs_ban.cpp # src/server/scripts/Commands/cs_disable.cpp --- src/common/Debugging/WheatyExceptionReport.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/common/Debugging/WheatyExceptionReport.cpp') diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 46192f33d34..266389bd4a7 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -129,7 +129,7 @@ PEXCEPTION_POINTERS pExceptionInfo) ++pos; TCHAR crash_folder_path[MAX_PATH]; - sprintf(crash_folder_path, "%s\\%s", module_folder_name, CrashFolder); + sprintf_s(crash_folder_path, "%s\\%s", module_folder_name, CrashFolder); if (!CreateDirectory(crash_folder_path, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) @@ -1410,12 +1410,15 @@ int __cdecl WheatyExceptionReport::stackprintf(const TCHAR * format, va_list arg int __cdecl WheatyExceptionReport::heapprintf(const TCHAR * format, va_list argptr) { - int retValue; + int retValue = 0; DWORD cbWritten; TCHAR* szBuff = (TCHAR*)malloc(sizeof(TCHAR) * WER_LARGE_BUFFER_SIZE); - retValue = vsprintf(szBuff, format, argptr); - WriteFile(m_hReportFile, szBuff, retValue * sizeof(TCHAR), &cbWritten, 0); - free(szBuff); + if (szBuff != nullptr) + { + retValue = vsprintf(szBuff, format, argptr); + WriteFile(m_hReportFile, szBuff, retValue * sizeof(TCHAR), &cbWritten, 0); + free(szBuff); + } return retValue; } -- cgit v1.2.3