Fixed a couple of memory leaks

Author: nickgammon

MUSHclient.cpp

@@ -248,7 +248,7 @@ BOOL CMUSHclientApp::InitInstance()
   // where we do file browsing from
   strcpy (file_browsing_dir, working_dir);
 
-//  bc_init_numbers();
+  bc_init_numbers();
 
 
   // First free the string that was allocated by MFC in the startup
@@ -396,7 +396,7 @@ BOOL CMUSHclientApp::InitInstance()
 
 // Set the debug-heap flag so that freed blocks are kept on the
    // linked list, to catch any inadvertent use of freed memory
-//   SET_CRT_DEBUG_FIELD( _CRTDBG_DELAY_FREE_MEM_DF );
+   SET_CRT_DEBUG_FIELD( _CRTDBG_DELAY_FREE_MEM_DF );
    SET_CRT_DEBUG_FIELD( _CRTDBG_LEAK_CHECK_DF );
 //   SET_CRT_DEBUG_FIELD( _CRTDBG_CHECK_ALWAYS_DF );
 // speed warning: see:   _ASSERTE( _CrtCheckMemory( ) );
@@ -1223,7 +1223,7 @@ int CMUSHclientApp::ExitInstance()
 
   THEMEGLUE_FREE ();
 
-//  bc_free_numbers ();  // free zero, one, two
+  bc_free_numbers ();  // free zero, one, two
 
   // free the resources DLL
   FreeLibrary (m_hInstDLL);

TextView.cpp

@@ -59,6 +59,8 @@ CTextView::CTextView()
 CTextView::~CTextView()
 {
 delete m_font;
+if (m_backbr)
+  m_backbr->DeleteObject ();
 delete m_backbr;
 }
 
@@ -186,6 +188,10 @@ void CTextView::OnInitialUpdate()
 
   SetTheFont ();
 
+  if (m_backbr)
+    m_backbr->DeleteObject ();
+  delete m_backbr;
+
   m_backbr = new CBrush (pDoc->m_backColour);
   m_backcolour = pDoc->m_backColour;
 
@@ -757,6 +763,8 @@ CRect rect;
   // recreate background colour if necessary  
   if (m_backcolour != pDoc->m_backColour)
     {
+    if (m_backbr)
+      m_backbr->DeleteObject ();
     delete m_backbr;
     m_backbr = new CBrush (pDoc->m_backColour);
     m_backcolour = pDoc->m_backColour;

doc_construct.cpp

@@ -643,7 +643,7 @@ int i;
          delete dbit->second;      // now delete memory used by it
          }
 
-}
+}   // end of CMUSHclientDoc::~CMUSHclientDoc
 
 
 BOOL CMUSHclientDoc::OnNewDocument()

resource.h

@@ -1562,7 +1562,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        363
+#define _APS_NEXT_RESOURCE_VALUE        364
 #define _APS_NEXT_COMMAND_VALUE         33054
 #define _APS_NEXT_CONTROL_VALUE         2897
 #define _APS_NEXT_SYMED_VALUE           312

scripting/lbc.c

@@ -274,7 +274,7 @@ static const luaL_reg R[] =
 
 LUALIB_API int luaopen_bc(lua_State *L)
 {
- bc_init_numbers();
+// bc_init_numbers();     // done once in MUSHclient.cpp
  lua_pushliteral(L,MYNAME);
  luaL_newmetatable(L,MYTYPE);
  luaL_openlib(L,NULL,R,0);

sendvw.cpp

@@ -265,6 +265,8 @@ CSendView::CSendView()
 
 CSendView::~CSendView()
 {
+if (m_backbr)
+  m_backbr->DeleteObject ();
 delete m_backbr;
 }
 
@@ -1127,6 +1129,8 @@ CRect rect;
   // recreate background colour if necessary  
   if (m_backcolour != pDoc->m_input_background_colour)
     {
+    if (m_backbr)
+      m_backbr->DeleteObject ();
     delete m_backbr;
     m_backbr = new CBrush (pDoc->m_input_background_colour);
     m_backcolour = pDoc->m_input_background_colour;
@@ -1207,6 +1211,9 @@ void CSendView::OnInitialUpdate()
 
   m_owner_frame->FixUpSplitterBar ();
 
+  if (m_backbr)
+    m_backbr->DeleteObject ();
+  delete m_backbr;
   m_backbr = new CBrush (pDoc->m_input_background_colour);
   m_backcolour = pDoc->m_input_background_colour;