avoid crash on retrieval extent from invalid vector data providers

(cherry picked from commit 6564da0)
qgis · Mar 7, 2019 · 09c85cd · 09c85cd
1 parent 4eecfb9
commit 09c85cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -771,7 +771,7 @@ QgsRectangle QgsVectorLayer::extent() const
     mLazyExtent = false;
   }
 
-  if ( !mValidExtent && mLazyExtent && mDataProvider )
+  if ( !mValidExtent && mLazyExtent && mDataProvider && mDataProvider->isValid() )
   {
     // get the extent
     QgsRectangle mbr = mDataProvider->extent();

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3224,7 +3224,7 @@ bool QgsPostgresProvider::empty() const
 
 QgsRectangle QgsPostgresProvider::extent() const
 {
-  if ( mGeometryColumn.isNull() )
+  if ( !isValid() || mGeometryColumn.isNull() )
     return QgsRectangle();
 
   if ( mSpatialColType == SctGeography )