Fix crash when creating spatial index from empty layer

wonder-sk · wonder-sk · commit 914cefff955c · 2018-05-08T20:28:27.000-04:00
libspatialindex library throws an exception when trying to bulk load spatial index
and it is given an empty input data stream
diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp
@@ -220,7 +220,7 @@ class QgsSpatialIndexData : public QSharedData
       // create R-tree
       SpatialIndex::id_type indexId;
 
-      if ( inputStream )
+      if ( inputStream && inputStream->hasNext() )
         mRTree = RTree::createAndBulkLoadNewRTree( RTree::BLM_STR, *inputStream, *mStorage, fillFactor, indexCapacity,
                  leafCapacity, dimension, variant, indexId );
       else
diff --git a/tests/src/core/testqgsspatialindex.cpp b/tests/src/core/testqgsspatialindex.cpp
@@ -99,6 +99,13 @@ class TestQgsSpatialIndex : public QObject
       QVERIFY( fids2.contains( 3 ) );
     }
 
+    void testInitFromEmptyIterator()
+    {
+      QgsFeatureIterator it;
+      QgsSpatialIndex index( it );
+      // we just test that we survive the above command without exception from libspatialindex raised
+    }
+
     void testCopy()
     {
       QgsSpatialIndex *index = new QgsSpatialIndex;

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ class TestQgsSpatialIndex : public QObject`
`99`	`99`	`QVERIFY( fids2.contains( 3 ) );`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ void testInitFromEmptyIterator()`
	`103`	`+ {`
	`104`	`+ QgsFeatureIterator it;`
	`105`	`+ QgsSpatialIndex index( it );`
	`106`	`+ // we just test that we survive the above command without exception from libspatialindex raised`
	`107`	`+ }`
	`108`	`+`
`102`	`109`	`void testCopy()`
`103`	`110`	`{`
`104`	`111`	`QgsSpatialIndex *index = new QgsSpatialIndex;`