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

mhugent · mhugent · commit 61cd9bd6586f · 2006-12-16T16:22:20.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6269 c8812cc2-4d05-0410-92ff-de0c093fc19c
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;
       }

Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,12 @@ QgsPoint QgsFeature::closestVertex(const QgsPoint& point) const`
`1437`	`1437`	`//`
`1438`	`1438`	`QgsRect QgsFeature::boundingBox() const`
`1439`	`1439`	`{`
`1440`		`- return mGeometry->boundingBox();`
	`1440`	`+ if(mGeometry)`
	`1441`	`+ {`
	`1442`	`+ return mGeometry->boundingBox();`
	`1443`	`+ }`
	`1444`	`+ QgsRect nullRect;`
	`1445`	`+ return nullRect;`
`1441`	`1446`	`}`
`1442`	`1447`	`// QgsRect QgsFeature::boundingBox() const`
`1443`	`1448`	`// {`
Original file line number	Diff line number	Diff line change
`@@ -853,6 +853,7 @@ void QgsVectorLayer::draw(QPainter * p,`
`853`	`853`	`{`
`854`	`854`	`if (mDeletedFeatureIds.find(fet->featureId()) != mDeletedFeatureIds.end())`
`855`	`855`	`{`
	`856`	`+ delete fet;`
`856`	`857`	`continue; //dont't draw feature marked as deleted`
`857`	`858`	`}`
`858`	`859`	`if (mChangedGeometries.find(fet->featureId()) != mChangedGeometries.end())`
`@@ -1557,8 +1558,11 @@ void QgsVectorLayer::updateExtents()`
`1557`	`1558`	`{`
`1558`	`1559`	`if(mDeletedFeatureIds.find(fet->featureId())==mDeletedFeatureIds.end())`
`1559`	`1560`	`{`
`1560`		`- bb=fet->boundingBox();`
`1561`		`- layerExtent.combineExtentWith(&bb);`
	`1561`	`+ if(fet->geometry())`
	`1562`	`+ {`
	`1563`	`+ bb=fet->boundingBox();`
	`1564`	`+ layerExtent.combineExtentWith(&bb);`
	`1565`	`+ }`
`1562`	`1566`	`}`
`1563`	`1567`	`delete fet;`
`1564`	`1568`	`}`