Fix memory leak when add colorpages

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 2666f6f..c2afaaf 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -134,7 +134,8 @@ int CGit::Run(CString cmd, CString* output,int code)
 \r
        if(ret)\r
                return ret;\r
-\r
+       \r
+       vector.push_back(0);\r
        StringAppend(output,&(vector[0]),code);\r
        return 0;\r
 }\r

diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 91563b2..782c2e2 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -118,6 +118,8 @@ void CSettings::RemovePropPages()
 ////   delete m_pLogCachePage;\r
 ////   delete m_pLogCacheListPage;\r
        delete m_pColorsPage;\r
+       delete m_pColorsPage2;\r
+       delete m_pColorsPage3;\r
        delete m_pSavedPage;\r
 //     delete m_pHooksPage;\r
        delete m_pBugTraqPage;\r

diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp
index d2bc778..490701e 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.cpp
+++ b/src/TortoiseProc/TortoiseProc.cpp
@@ -120,6 +120,7 @@ BOOL CTortoiseProcApp::InitInstance()
        CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));\r
        CMFCButton::EnableWindowsTheming();\r
 \r
+       \r
        if(!CheckMsysGitDir())\r
        {\r
                if(CMessageBox::Show(NULL,_T("MSysGit(http://code.google.com/p/msysgit) have not installed Correctly\n\\r