Merge pull request #2868 from manisandro/next_vertex

Fix out of bounds array access if nextVertex is called on empty geometry collection
qgis · Mar 6, 2016 · c50161d · c50161d
2 parents 42d8884 + 1e90786
commit c50161d
Show file tree

Hide file tree

Showing 2 changed files with 8 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 ) )

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -34,6 +34,7 @@
 #include "qgslinestringv2.h"
 #include "qgspolygonv2.h"
 #include "qgscircularstringv2.h"
+#include "qgsgeometrycollectionv2.h"
 
 //qgs unit test utility class
 #include "qgsrenderchecker.h"
@@ -360,6 +361,9 @@ void TestQgsGeometry::isEmpty()
 
   geom.setGeometry( 0 );
   QVERIFY( geom.isEmpty() );
+
+  QgsGeometryCollectionV2 collection;
+  QVERIFY( collection.isEmpty() );
 }
 
 void TestQgsGeometry::pointV2()