leak fixes

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index 19676fad97ee50203a59122b50b25065a59cdffb..3b93f06864cefe0216df3a9f843e8063e8809719 100644 (file)
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -67,6 +67,7 @@ FGRouteMgr::FGRouteMgr() :
 
 FGRouteMgr::~FGRouteMgr() {
     input->removeChangeListener(listener);
+    delete listener;
     delete route;
 }
 

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index cf9c6505faefd68dff5f2cdfabb23f86666f19d2..f54fbf6d3e6ed6c016a1aaa09651931927f641db 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -368,10 +368,10 @@ FGMetarEnvironmentCtrl::~FGMetarEnvironmentCtrl ()
 {
 #if defined(ENABLE_THREADS)
    thread_stop();
+   delete thread;
 #endif // ENABLE_THREADS
 
    delete env;
-   env = NULL;
 }
 
 

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 905ddfc4af4aa46952846ad893d94e9ca2e6bc1c..5d7df98b072139e99d8b84f59ed05e0546cc81bc 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -58,12 +58,14 @@ FGClouds::FGClouds(FGEnvironmentCtrl * controller) :
 {
        update_event = 0;
 }
+
 FGClouds::~FGClouds() {
 }
 
 int FGClouds::get_update_event(void) const {
        return update_event;
 }
+
 void FGClouds::set_update_event(int count) {
        update_event = count;
        buildCloudLayers();

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index d991893331b9e4d373c744d06a52e1f321efac9f..6cdb5df16eaee8bf91fd60230a815ef14e4b9279 100644 (file)
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -64,7 +64,7 @@ void buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, co
         bool clouds_3d_enabled;
         string last_scenario;
         string scenario;
-        SGPropertyNode *last_env_config, *last_env_clouds;
+        SGPropertyNode_ptr last_env_config, last_env_clouds;
 
 public:
        FGClouds(FGEnvironmentCtrl * controller);

diff --git a/src/FDM/SP/ADA.cxx b/src/FDM/SP/ADA.cxx
index b93fbc711c1c9ca09f3119853d34a86f95f1ad4a..9aaa468fac9f6ee20427b18614328067595adf58 100644 (file)
--- a/src/FDM/SP/ADA.cxx
+++ b/src/FDM/SP/ADA.cxx
@@ -159,12 +159,15 @@ static struct {
 #define anzg sixdof_to_visuals.anzg
 
 
-FGADA::FGADA( double dt ) {
+FGADA::FGADA( double dt ) :
+    fdmsock(0)
+{
 //     set_delta_t( dt );
 }
 
 
 FGADA::~FGADA() {
+    delete fdmsock;
 }
 
 

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.cpp b/src/FDM/UIUCModel/uiuc_1DdataFileReader.cpp
index 03b7ba2ad771ccecce05433d9dc9a9c8e50ff58d..7b91c9a2e352302b7074d46e61f5a136377e37ea 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.cpp
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.cpp
@@ -114,6 +114,7 @@ uiuc_1DdataFileReader( string file_name,
       //};
       data = 1;
     }
+  delete matrix;
   return data;
 }
 
@@ -153,6 +154,7 @@ uiuc_1DdataFileReader( string file_name,
       counter++;
       data = 1;
     }
+  delete matrix;
   return data;
 }
 

diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp b/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp
index 0bb5cccdb4ac7e640891e4ef85af66e388db5b71..6faabfdce635566be33ad99cc066a0b9bc021673 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp
@@ -133,6 +133,7 @@ void uiuc_2DdataFileReader( string file_name,
           counter_x++;
         }
     }
+  delete matrix;
   return;
 }
 

diff --git a/src/FDM/UIUCModel/uiuc_flapdata.cpp b/src/FDM/UIUCModel/uiuc_flapdata.cpp
index 1318b6b6d9c4fffc7a098669fcceeb995aeeab3e..7c64d697167af58ed99c0047de7a0afd0a9af796 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_flapdata.cpp
+++ b/src/FDM/UIUCModel/uiuc_flapdata.cpp
@@ -115,10 +115,10 @@ FlapData::~FlapData(){
   delete[] thrustTable;
   delete[] momentTable;
   delete[] inertiaTable;
-  delete alphaArray;
-  delete speedArray;
-  delete freqArray;
-  delete phiArray;
+  delete[] alphaArray;
+  delete[] speedArray;
+  delete[] freqArray;
+  delete[] phiArray;
 }
 
 //An initialization function that does the same thing

diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index f4308bbb3225fbbbfd85761b083dccaac8b83972..dd8a6c62dcc343b1def393a8b6e9905ade310dde 100644 (file)
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@@ -178,6 +178,7 @@ KLN89::~KLN89() {
        }
        
        delete _dir_page;
+       delete _nrst_page;
        
        for(unsigned int i=0; i<_maxFlightPlans; ++i) {
                ClearFlightPlan(i);

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 164446cb4bf5d53f532ca6d390b65806e06072ee..607684dd693e3f66fa57e23d476c23c54017353f 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -994,8 +994,8 @@ fgInitNav ()
     SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
     SGPath p_fix( globals->get_fg_root() );
     p_fix.append( "Navaids/fix.dat" );
-    FGFixList *fixlist = new FGFixList;
-    fixlist->init( p_fix );
+    FGFixList fixlist;
+    fixlist.init( p_fix );  // adds fixes to the DB in positioned.cxx
 
     SG_LOG(SG_GENERAL, SG_INFO, "  Airways");
     SGPath p_awy( globals->get_fg_root() );

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index d4cbdd5a4266dcf0f5631ca1282e7c64928911e0..0b550b46c7144a534057c7d8231252042e017346 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -48,7 +48,6 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Navaids/navlist.hxx>
-#include <Navaids/fixlist.hxx>
 
 #include "globals.hxx"
 #include "renderer.hxx"

diff --git a/src/Sound/voice.cxx b/src/Sound/voice.cxx
index cdd90d330a930eb173ed6c5268bab6168f52bfc7..04e9a3debaac352d34bd4eb73acc6aa48ddc6359 100644 (file)
--- a/src/Sound/voice.cxx
+++ b/src/Sound/voice.cxx
@@ -52,6 +52,7 @@ FGVoiceMgr::~FGVoiceMgr()
                return;
        _thread->cancel();
        _thread->join();
+       delete _thread;
 #endif
 }