Skip to content

Commit

Permalink
Fix OGR iterator crash on timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Aug 3, 2018
1 parent 14eb0e5 commit 92ace51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/providers/ogr/qgsogrfeatureiterator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 92ace51

Please sign in to comment.