Fix GPX provider crashes if feature count is called on an invalid layer

qgis · Jul 30, 2021 · 18813d2 · 18813d2
1 parent f5e0222
commit 18813d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -3428,8 +3428,8 @@ QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const
 
 long long QgsVectorLayer::featureCount() const
 {
-  if ( ! mDataProvider )
-    return -1;
+  if ( !mDataProvider )
+    return static_cast< long long >( Qgis::FeatureCountState::UnknownCount );
   return mDataProvider->featureCount() +
          ( mEditBuffer && ! mDataProvider->transaction() ? mEditBuffer->addedFeatures().size() - mEditBuffer->deletedFeatureIds().size() : 0 );
 }

diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -158,6 +158,9 @@ QgsWkbTypes::Type QgsGPXProvider::wkbType() const
  */
 long long QgsGPXProvider::featureCount() const
 {
+  if ( !data )
+    return static_cast< long long >( Qgis::FeatureCountState::UnknownCount );
+
   if ( mFeatureType == WaypointType )
     return data->getNumberOfWaypoints();
   if ( mFeatureType == RouteType )