Fix OGR iterator crash on timeout

qgis · Aug 3, 2018 · 92ace51 · 92ace51
1 parent 14eb0e5
commit 92ace51
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -57,7 +57,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   {
     //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
     mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );
-    if ( !mConn->ds )
+    if ( !mConn || !mConn->ds )
     {
       return;
     }