fixed two small memory leaks

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5391 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 28, 2006 · 2123e4b · 2123e4b
1 parent ae4e603
commit 2123e4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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();