Fix crash in geometry collections with negative part numbers

nyalldawson · nyalldawson · commit 0e908d5d5bba · 2017-09-25T17:20:36.000+10:00
diff --git a/src/core/geometry/qgsgeometrycollection.cpp b/src/core/geometry/qgsgeometrycollection.cpp
@@ -449,7 +449,7 @@ bool QgsGeometryCollection::insertVertex( QgsVertexId position, const QgsPoint &
 
 bool QgsGeometryCollection::moveVertex( QgsVertexId position, const QgsPoint &newPos )
 {
-  if ( position.part >= mGeometries.size() )
+  if ( position.part < 0 || position.part >= mGeometries.size() )
   {
     return false;
   }
@@ -464,7 +464,7 @@ bool QgsGeometryCollection::moveVertex( QgsVertexId position, const QgsPoint &ne
 
 bool QgsGeometryCollection::deleteVertex( QgsVertexId position )
 {
-  if ( position.part >= mGeometries.size() )
+  if ( position.part < 0 || position.part >= mGeometries.size() )
   {
     return false;
   }
@@ -613,7 +613,7 @@ QgsAbstractGeometry *QgsGeometryCollection::segmentize( double tolerance, Segmen
 
 double QgsGeometryCollection::vertexAngle( QgsVertexId vertex ) const
 {
-  if ( vertex.part >= mGeometries.size() )
+  if ( vertex.part < 0 || vertex.part >= mGeometries.size() )
   {
     return 0.0;
   }

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ bool QgsGeometryCollection::insertVertex( QgsVertexId position, const QgsPoint &`
`449`	`449`
`450`	`450`	`bool QgsGeometryCollection::moveVertex( QgsVertexId position, const QgsPoint &newPos )`
`451`	`451`	`{`
`452`		`- if ( position.part >= mGeometries.size() )`
	`452`	`+ if ( position.part < 0 \|\| position.part >= mGeometries.size() )`
`453`	`453`	`{`
`454`	`454`	`return false;`
`455`	`455`	`}`
`@@ -464,7 +464,7 @@ bool QgsGeometryCollection::moveVertex( QgsVertexId position, const QgsPoint &ne`
`464`	`464`
`465`	`465`	`bool QgsGeometryCollection::deleteVertex( QgsVertexId position )`
`466`	`466`	`{`
`467`		`- if ( position.part >= mGeometries.size() )`
	`467`	`+ if ( position.part < 0 \|\| position.part >= mGeometries.size() )`
`468`	`468`	`{`
`469`	`469`	`return false;`
`470`	`470`	`}`
`@@ -613,7 +613,7 @@ QgsAbstractGeometry *QgsGeometryCollection::segmentize( double tolerance, Segmen`
`613`	`613`
`614`	`614`	`double QgsGeometryCollection::vertexAngle( QgsVertexId vertex ) const`
`615`	`615`	`{`
`616`		`- if ( vertex.part >= mGeometries.size() )`
	`616`	`+ if ( vertex.part < 0 \|\| vertex.part >= mGeometries.size() )`
`617`	`617`	`{`
`618`	`618`	`return 0.0;`
`619`	`619`	`}`