Merge pull request #9207 from mbernasocchi/master

m-kuhn · web-flow · commit ddbd06f3f11e · 2019-02-20T14:02:16.000+01:00
Add safety guard when mDataProvider is not set
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -1507,6 +1507,8 @@ Returns the list of attributes which make up the layer's primary keys.
 %Docstring
 Returns feature count including changes which have not yet been committed
 If you need only the count of committed features call this method on this layer's provider.
+
+:return: the number of features on this layer or -1 if unknown.
 %End
 
     bool setReadOnly( bool readonly = true );
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2891,6 +2891,8 @@ QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const
 
 long QgsVectorLayer::featureCount() const
 {
+  if ( ! mDataProvider )
+    return -1;
   return mDataProvider->featureCount() +
          ( mEditBuffer ? mEditBuffer->mAddedFeatures.size() - mEditBuffer->mDeletedFeatureIds.size() : 0 );
 }
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1397,6 +1397,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
     /**
      * Returns feature count including changes which have not yet been committed
      * If you need only the count of committed features call this method on this layer's provider.
+     * \returns the number of features on this layer or -1 if unknown.
      */
     long featureCount() const FINAL;
 

Original file line number	Diff line number	Diff line change
`@@ -2891,6 +2891,8 @@ QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const`
`2891`	`2891`
`2892`	`2892`	`long QgsVectorLayer::featureCount() const`
`2893`	`2893`	`{`
	`2894`	`+ if ( ! mDataProvider )`
	`2895`	`+ return -1;`
`2894`	`2896`	`return mDataProvider->featureCount() +`
`2895`	`2897`	`( mEditBuffer ? mEditBuffer->mAddedFeatures.size() - mEditBuffer->mDeletedFeatureIds.size() : 0 );`
`2896`	`2898`	`}`