Fix for ticket #445 qgis crash deleting point in postgis table

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6269 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 16, 2006 · 61cd9bd · 61cd9bd
1 parent 9f15257
commit 61cd9bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/core/qgsfeature.cpp b/src/core/qgsfeature.cpp
@@ -1437,7 +1437,12 @@ QgsPoint QgsFeature::closestVertex(const QgsPoint& point) const
 // 
 QgsRect QgsFeature::boundingBox() const
 {
-  return mGeometry->boundingBox();
+  if(mGeometry)
+    {
+      return mGeometry->boundingBox();
+    }
+  QgsRect nullRect;
+  return nullRect;
 }
 // QgsRect QgsFeature::boundingBox() const
 // {

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -853,6 +853,7 @@ void QgsVectorLayer::draw(QPainter * p,
 	  {
 	    if (mDeletedFeatureIds.find(fet->featureId()) != mDeletedFeatureIds.end())
 	      {
+		delete fet;
 		continue; //dont't draw feature marked as deleted
 	      }
 	    if (mChangedGeometries.find(fet->featureId()) != mChangedGeometries.end())
@@ -1557,8 +1558,11 @@ void QgsVectorLayer::updateExtents()
       {
         if(mDeletedFeatureIds.find(fet->featureId())==mDeletedFeatureIds.end())
         {
-          bb=fet->boundingBox();
-          layerExtent.combineExtentWith(&bb);
+	  if(fet->geometry())
+	    {
+	      bb=fet->boundingBox();
+	      layerExtent.combineExtentWith(&bb);
+	    }
         }
         delete fet;
       }