sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when creating spatial index from empty layer

Browse Source 
libspatialindex library throws an exception when trying to bulk load spatial index
and it is given an empty input data stream
This commit is contained in:
Martin Dobias 2018-05-08 16:16:11 -04:00
parent f2304c1b15
commit 914cefff95
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsspatialindex.cpp
View File

@ -220,7 +220,7 @@ class QgsSpatialIndexData : public QSharedData
// create R-tree // create R-tree
SpatialIndex::id_type indexId; SpatialIndex::id_type indexId;
if ( inputStream ) if ( inputStream && inputStream->hasNext() )
mRTree = RTree::createAndBulkLoadNewRTree( RTree::BLM_STR, *inputStream, *mStorage, fillFactor, indexCapacity, mRTree = RTree::createAndBulkLoadNewRTree( RTree::BLM_STR, *inputStream, *mStorage, fillFactor, indexCapacity,
leafCapacity, dimension, variant, indexId ); leafCapacity, dimension, variant, indexId );
else else

7
tests/src/core/testqgsspatialindex.cpp
View File

@ -99,6 +99,13 @@ class TestQgsSpatialIndex : public QObject
QVERIFY( fids2.contains( 3 ) ); 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() void testCopy()
{ {
QgsSpatialIndex *index = new QgsSpatialIndex; QgsSpatialIndex *index = new QgsSpatialIndex;