ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from cxd4/WriteTrace-no-crash 

[Common] Evade null pointer exception while tracing pre-AppInit().
This commit is contained in:
zilmar 2016-06-28 16:01:23 +10:00 committed by GitHub
parent 46c6a6b0df beb56dd72f
commit 2e0cc5d5bc
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Common/path.cpp
View File

@ -12,6 +12,17 @@
#endif #endif
#include "Platform.h" #include "Platform.h"
/*
* g_ModuleLogLevel may be NULL while AppInit() is still in session in path.cpp.
* The added check to compare to NULL here is at least a temporary workaround.
*/
#undef WriteTrace
#ifdef _WIN32
#define WriteTrace(m, s, format, ...) if (g_ModuleLogLevel != NULL && g_ModuleLogLevel[(m)] >= (s)) { WriteTraceFull((m), (s), __FILE__, __LINE__, __FUNCTION__, (format), ## __VA_ARGS__); }
#else
#define WriteTrace(m, s, format, ...) if (g_ModuleLogLevel != NULL && g_ModuleLogLevel[(m)] >= (s)) { WriteTraceFull((m), (s), __FILE__, __LINE__, __PRETTY_FUNCTION__, (format), ## __VA_ARGS__); }
#endif
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Constants // Constants
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////