[ogr provider] backport @m-kuhn commit 92ace51

nirvn · nirvn · commit aa433765ebdb · 2018-08-15T15:20:50.000+07:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -48,7 +48,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
 
   //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
   mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );
-  if ( !mConn->ds )
+  if ( !mConn || !mConn->ds )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool`
`48`	`48`
`49`	`49`	`//QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");`
`50`	`50`	`mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );`
`51`		`- if ( !mConn->ds )`
	`51`	`+ if ( !mConn \|\| !mConn->ds )`
`52`	`52`	`{`
`53`	`53`	`return;`
`54`	`54`	`}`