Make initterm callstack fix to try to stop false positives

mattdurak · Oct 16, 2020 · 3d41e75 · 3d41e75
1 parent c334083
commit 3d41e75
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/setup/version.h b/setup/version.h
@@ -1,9 +1,9 @@
 
-#define VLDVERSION          L"2.5.4"
-#define VERSION_NUMBER		2,5,4,0
-#define VERSION_STRING		"2.5.4.0"
+#define VLDVERSION          L"2.5.5"
+#define VERSION_NUMBER		2,5,5,0
+#define VERSION_STRING		"2.5.5.0"
 #define VERSION_COPYRIGHT	"Copyright (C) 2005-2020"
 
 #ifndef __FILE__
-!define VLD_VERSION "2.5.4"	// NSIS Script
+!define VLD_VERSION "2.5.5"	// NSIS Script
 #endif
diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Visual Leak Detector"
-#define MyAppVersion "2.5.4"
+#define MyAppVersion "2.5.5"
 #define MyAppPublisher "VLD Team"
 #define MyAppURL "http://vld.codeplex.com/"
 #define MyAppRegKey "Software\Visual Leak Detector"

diff --git a/src/callstack.cpp b/src/callstack.cpp
@@ -538,7 +538,9 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const
         || (wcscmp(functionName, L"_wsetlocale") == 0)
         || (wcscmp(functionName, L"_Getctype") == 0)
         || (wcscmp(functionName, L"std::_Facet_Register") == 0)
-        || endWith(functionName, len, L">::_Getcat")
+        || endWith(functionName, len, L">::_Getcat")
+        // Added fixes
+        || endWith(functionName, len, L"initterm")
         ) {
         return CALLSTACK_STATUS_STARTUPCRT;
     }