Fix out of bounds array access if nextVertex is called on empty QgsGe…

…ometryCollectionV2 (cherry-picked from 4c0e78a)
qgis · Mar 6, 2016 · 1031172 · 1031172
1 parent e2879c3
commit 1031172
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp
@@ -374,6 +374,10 @@ bool QgsGeometryCollectionV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex )
     id.ring = -1;
     id.vertex = -1;
   }
+  if ( mGeometries.isEmpty() )
+  {
+    return false;
+  }
 
   QgsAbstractGeometryV2* geom = mGeometries.at( id.part );
   if ( geom->nextVertex( id, vertex ) )