Fix crash when OGR layer is removed when source is stored

Remove link to provider in OGR feature source (cherry-picked from 0dfe687)
qgis · May 9, 2017 · a6883f7 · a6883f7
1 parent 8309c3c
commit a6883f7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
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;