Fix crash when OGR layer is removed when source is stored

nyalldawson · nyalldawson · commit a6883f7a0ba4 · 2017-05-09T11:56:39.000+10:00
Remove link to provider in OGR feature source (cherry-picked from 0dfe687)
diff --git a/src/providers/ogr/qgsogrexpressioncompiler.cpp b/src/providers/ogr/qgsogrexpressioncompiler.cpp
@@ -88,7 +88,7 @@ QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const Qg
 
 QString QgsOgrExpressionCompiler::quotedIdentifier( const QString& identifier )
 {
-  return mSource->mProvider->quotedIdentifier( identifier.toUtf8() );
+  return QgsOgrProviderUtils::quotedIdentifier( identifier.toUtf8(), mSource->mDriverName );
 }
 
 QString QgsOgrExpressionCompiler::quotedValue( const QVariant& value, bool& ok )
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
     , mFilterFids( mRequest.filterFids() )
     , mFilterFidsIt( mFilterFids.constBegin() )
 {
-  mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );
+  mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mDataSource );
   if ( !mConn->ds )
   {
     return;
@@ -354,7 +354,6 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
 
 
 QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p )
-    : mProvider( p )
 {
   mDataSource = p->dataSourceUri();
   mLayerName = p->layerName();
diff --git a/src/providers/ogr/qgsogrfeatureiterator.h b/src/providers/ogr/qgsogrfeatureiterator.h
@@ -32,7 +32,6 @@ class QgsOgrFeatureSource : public QgsAbstractFeatureSource
     virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest& request ) override;
 
   protected:
-    const QgsOgrProvider* mProvider;
     QString mDataSource;
     QString mLayerName;
     int mLayerIndex;

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const Qg`
`88`	`88`
`89`	`89`	`QString QgsOgrExpressionCompiler::quotedIdentifier( const QString& identifier )`
`90`	`90`	`{`
`91`		`- return mSource->mProvider->quotedIdentifier( identifier.toUtf8() );`
	`91`	`+ return QgsOgrProviderUtils::quotedIdentifier( identifier.toUtf8(), mSource->mDriverName );`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`QString QgsOgrExpressionCompiler::quotedValue( const QVariant& value, bool& ok )`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`46`	`46`	`, mFilterFids( mRequest.filterFids() )`
`47`	`47`	`, mFilterFidsIt( mFilterFids.constBegin() )`
`48`	`48`	`{`
`49`		`- mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );`
	`49`	`+ mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mDataSource );`
`50`	`50`	`if ( !mConn->ds )`
`51`	`51`	`{`
`52`	`52`	`return;`
`@@ -354,7 +354,6 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )`
`354`	`354`
`355`	`355`
`356`	`356`	`QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p )`
`357`		`- : mProvider( p )`
`358`	`357`	`{`
`359`	`358`	`mDataSource = p->dataSourceUri();`
`360`	`359`	`mLayerName = p->layerName();`