[ogr] do not crash if ogr layer is null

elpaso · elpaso · commit 7bbd1ca25222 · 2018-11-05T10:24:35.000+01:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -892,15 +892,16 @@ QStringList QgsOgrProvider::_subLayers( bool withFeatureCount )  const
 void QgsOgrProvider::setEncoding( const QString &e )
 {
   QgsSettings settings;
-  if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) && settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) || !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) )
+  if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) &&
+         settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) ||
+       ( mOgrLayer && !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) ) )
   {
     QgsVectorDataProvider::setEncoding( e );
   }
   else
   {
     QgsVectorDataProvider::setEncoding( QStringLiteral( "UTF-8" ) );
   }
-
   loadFields();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -892,15 +892,16 @@ QStringList QgsOgrProvider::_subLayers( bool withFeatureCount ) const`
`892`	`892`	`void QgsOgrProvider::setEncoding( const QString &e )`
`893`	`893`	`{`
`894`	`894`	`QgsSettings settings;`
`895`		`- if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) && settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) \|\| !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) )`
	`895`	`+ if ( ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) &&`
	`896`	`+ settings.value( QStringLiteral( "qgis/ignoreShapeEncoding" ), true ).toBool() ) \|\|`
	`897`	`+ ( mOgrLayer && !mOgrLayer->TestCapability( OLCStringsAsUTF8 ) ) )`
`896`	`898`	`{`
`897`	`899`	`QgsVectorDataProvider::setEncoding( e );`
`898`	`900`	`}`
`899`	`901`	`else`
`900`	`902`	`{`
`901`	`903`	`QgsVectorDataProvider::setEncoding( QStringLiteral( "UTF-8" ) );`
`902`	`904`	`}`
`903`		`-`
`904`	`905`	`loadFields();`
`905`	`906`	`}`
`906`	`907`