avoid crash on retrieval extent from invalid vector data providers

jef-n · nyalldawson · commit 09c85cd157b6 · 2019-03-07T10:24:53.000+10:00
(cherry picked from commit 6564da0)
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 )

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ QgsRectangle QgsVectorLayer::extent() const`
`771`	`771`	`mLazyExtent = false;`
`772`	`772`	`}`
`773`	`773`
`774`		`- if ( !mValidExtent && mLazyExtent && mDataProvider )`
	`774`	`+ if ( !mValidExtent && mLazyExtent && mDataProvider && mDataProvider->isValid() )`
`775`	`775`	`{`
`776`	`776`	`// get the extent`
`777`	`777`	`QgsRectangle mbr = mDataProvider->extent();`
Original file line number	Diff line number	Diff line change
`@@ -3224,7 +3224,7 @@ bool QgsPostgresProvider::empty() const`
`3224`	`3224`
`3225`	`3225`	`QgsRectangle QgsPostgresProvider::extent() const`
`3226`	`3226`	`{`
`3227`		`- if ( mGeometryColumn.isNull() )`
	`3227`	`+ if ( !isValid() \|\| mGeometryColumn.isNull() )`
`3228`	`3228`	`return QgsRectangle();`
`3229`	`3229`
`3230`	`3230`	`if ( mSpatialColType == SctGeography )`