Avoid cppcheck warning about potential nullptr dereference

qgis · Mar 6, 2021 · 94052bc · 94052bc
1 parent ec3fbaa
commit 94052bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -165,10 +165,12 @@ void QgsMapToolAnnotation::keyPressEvent( QKeyEvent *e )
 void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e )
 {
   QgsMapCanvasAnnotationItem *item = selectedItem();
-  if ( !item || !item->annotation() )
+  if ( !item )
     return;
 
   QgsAnnotation *annotation = item->annotation();
+  if ( !annotation )
+    return;
 
   if ( e->buttons() & Qt::LeftButton )
   {

diff --git a/src/core/pointcloud/qgspointclouddataprovider.cpp b/src/core/pointcloud/qgspointclouddataprovider.cpp
@@ -44,7 +44,8 @@ QgsPointCloudDataProvider::Capabilities QgsPointCloudDataProvider::capabilities(
 
 bool QgsPointCloudDataProvider::hasValidIndex() const
 {
-  return index() && index()->isValid();
+  QgsPointCloudIndex *lIndex = index();
+  return lIndex && lIndex->isValid();
 }
 
 QgsGeometry QgsPointCloudDataProvider::polygonBounds() const