fixed two small memory leaks

mhugent · mhugent · commit 0c93f6a7b58c · 2006-04-28T20:59:27.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5391 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -361,6 +361,7 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,
 #endif
         if (dataProvider->isValid())
         {
+	  delete myLib;
           return dataProvider;
         }
         else
@@ -369,7 +370,7 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,
             QgsDebugMsg( "Invalid data provider" );
 
             myLib->unload();
-
+	    delete myLib;
             return 0;
         }
       }
@@ -378,15 +379,15 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,
         QgsLogger::warning( "Unable to instantiate the data provider plugin" );
 
         myLib->unload();
-
+	delete myLib;
         return 0;
       }
     }
   }
   else
   {
     QgsLogger::warning( "Failed to load ../providers/libproviders.so" );
-
+    delete myLib;
     return 0;
   }
   
diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -172,6 +172,7 @@ QgsVectorLayer::~QgsVectorLayer()
   delete popMenu;
   // delete the provider lib pointer
   delete myLib;
+  delete mLabel;
 
   // Destroy and cached geometries and clear the references to them
   for (std::map<int, QgsGeometry*>::iterator it  = mCachedGeometries.begin(); 

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,7 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,`
`361`	`361`	`#endif`
`362`	`362`	`if (dataProvider->isValid())`
`363`	`363`	`{`
	`364`	`+ delete myLib;`
`364`	`365`	`return dataProvider;`
`365`	`366`	`}`
`366`	`367`	`else`
`@@ -369,7 +370,7 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,`
`369`	`370`	`QgsDebugMsg( "Invalid data provider" );`
`370`	`371`
`371`	`372`	`myLib->unload();`
`372`		`-`
	`373`	`+ delete myLib;`
`373`	`374`	`return 0;`
`374`	`375`	`}`
`375`	`376`	`}`
`@@ -378,15 +379,15 @@ QgsDataProvider* QgsProviderRegistry::getProvider( QString const & providerKey,`
`378`	`379`	`QgsLogger::warning( "Unable to instantiate the data provider plugin" );`
`379`	`380`
`380`	`381`	`myLib->unload();`
`381`		`-`
	`382`	`+ delete myLib;`
`382`	`383`	`return 0;`
`383`	`384`	`}`
`384`	`385`	`}`
`385`	`386`	`}`
`386`	`387`	`else`
`387`	`388`	`{`
`388`	`389`	`QgsLogger::warning( "Failed to load ../providers/libproviders.so" );`
`389`		`-`
	`390`	`+ delete myLib;`
`390`	`391`	`return 0;`
`391`	`392`	`}`
`392`	`393`