#1257 Added null pointer guarding based on reports from CppCheck

ApplicationCode/Application/RiaApplication.cpp

@@ -606,12 +606,14 @@ void RiaApplication::loadAndUpdatePlotData()
         }
     }
     
-    plotProgress.setNextProgressIncrement(flowColl->plotCount());
 
     if (flowColl)
     {
         flowColl->loadDataAndUpdate();
+
+        plotProgress.setNextProgressIncrement(flowColl->plotCount());
     }
+
     plotProgress.incrementProgress();
 
 }

ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp

@@ -45,7 +45,7 @@ bool RicDeleteWellLogPlotTrackFeature::isCommandEnabled()
     {
         RimWellLogPlot* wellLogPlot = NULL;
         selection[0]->firstAncestorOrThisOfType(wellLogPlot);
-        if (wellLogPlot->trackCount() > 1)
+        if (wellLogPlot && wellLogPlot->trackCount() > 1)
         {
             return true;
         }

ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp

@@ -295,7 +295,7 @@ bool RimCellRangeFilter::isRangeFilterControlled()
     CVF_ASSERT(rimView);
 
     bool isRangeFilterControlled = false;
-    if (rimView->viewController() && rimView->viewController()->isRangeFiltersControlled())
+    if (rimView && rimView->viewController() && rimView->viewController()->isRangeFiltersControlled())
     {
         isRangeFilterControlled = true;
     }

ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp

@@ -148,6 +148,7 @@ void RimCellRangeFilterCollection::updateDisplayModeNotifyManagedViews(RimCellRa
 {
     RimView* view = NULL;
     firstAncestorOrThisOfType(view);
+    if (!view) return;
 
     if (view->isMasterView())
     {

ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp

@@ -242,11 +242,15 @@ bool RimEclipsePropertyFilter::isPropertyFilterControlled()
     CVF_ASSERT(rimView);
 
     bool isPropertyFilterControlled = false;
+
+    if (rimView)
+    {
         RimViewController* vc = rimView->viewController();
         if (vc && vc->isPropertyFilterOveridden())
         {
             isPropertyFilterControlled = true;
         }
+    }
 
     return isPropertyFilterControlled;
 }

ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp

@@ -142,12 +142,15 @@ void RimEclipsePropertyFilterCollection::updateIconState()
 
     RimEclipseView* view = NULL;
     this->firstAncestorOrThisOfType(view);
+    if (view)
+    {
         RimViewController* viewController = view->viewController();
         if (viewController && (viewController->isPropertyFilterOveridden() 
                                || viewController->isVisibleCellsOveridden()))
         {
             activeIcon = false;
         }
+    }
 
     if (!isActive)
     {

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -593,10 +593,14 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const
 {
     CVF_ASSERT(m_resultType() == RimDefines::FLOW_DIAGNOSTICS);
 
+    size_t timeStep = 0;
+
     RimView* rimView = nullptr;
     this->firstAncestorOrThisOfType(rimView);
-
+    if (rimView)
-    size_t timeStep = rimView->currentTimeStep();
+    {
+        timeStep = rimView->currentTimeStep();
+    }
 
     std::set<std::string> selTracerNames;
     if (m_flowTracerSelectionMode == FLOW_TR_BY_SELECTION)

ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp

@@ -55,6 +55,8 @@ void RimGeoMechCellColors::updateIconState()
     this->firstAncestorOrThisOfType(rimView);
     CVF_ASSERT(rimView);
 
+    if (rimView)
+    {
         RimViewController* viewController = rimView->viewController();
         if (viewController && viewController->isResultColorControlled())
         {
@@ -64,6 +66,7 @@ void RimGeoMechCellColors::updateIconState()
         {
             updateUiIconFromState(true);
         }
+    }
 
     uiCapability()->updateConnectedEditors();
 }

ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp

@@ -190,16 +190,19 @@ void RimGeoMechPropertyFilter::updateReadOnlyStateOfAllFields()
 //--------------------------------------------------------------------------------------------------
 bool RimGeoMechPropertyFilter::isPropertyFilterControlled()
 {
+    bool isPropertyFilterControlled = false;
+
     RimView* rimView = NULL;
     firstAncestorOrThisOfType(rimView);
     CVF_ASSERT(rimView);
-
+    if (rimView)
-    bool isPropertyFilterControlled = false;
+    {
         RimViewController* vc = rimView->viewController();
         if (vc && vc->isPropertyFilterOveridden())
         {
             isPropertyFilterControlled = true;
         }
+    }
    
     return isPropertyFilterControlled;
 }

ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp

@@ -144,12 +144,15 @@ void RimGeoMechPropertyFilterCollection::updateIconState()
 
     RimGeoMechView* view = NULL;
     this->firstAncestorOrThisOfType(view);
+    if (view)
+    {
         RimViewController* viewController = view->viewController();
         if (viewController && ( viewController->isPropertyFilterOveridden() 
                                 || viewController->isVisibleCellsOveridden()))
         {
             activeIcon = false;
         }
+    }
 
     if (!isActive)
     {

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp

@@ -82,7 +82,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate()
         firstAncestorOrThisOfType(wellLogPlot);
         CVF_ASSERT(wellLogPlot);
 
-        if (wellLogPlot->depthType() == RimWellLogPlot::TRUE_VERTICAL_DEPTH)
+        if (wellLogPlot && wellLogPlot->depthType() == RimWellLogPlot::TRUE_VERTICAL_DEPTH)
         {
             if (RiaApplication::instance()->preferences()->showLasCurveWithoutTvdWarning())
             {

ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp

@@ -435,7 +435,10 @@ void RimSummaryCurveFilter::updatePlotAxisForCurves()
 
     RimSummaryPlot* plot = nullptr;
     firstAncestorOrThisOfType(plot);
+    if (plot)
+    {
         plot->updateAxes();
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp

@@ -311,6 +311,7 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* c
 {
     RimSummaryPlot* rimSummaryPlot = nullptr;
     this->firstAncestorOrThisOfType(rimSummaryPlot);
+    if (!rimSummaryPlot) return;
 
     if (changedField == &m_visibleDateRangeMax)
     {

ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp

@@ -155,14 +155,17 @@ bool RimSummaryYAxisProperties::isActive() const
 //--------------------------------------------------------------------------------------------------
 void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
-    RimSummaryPlot* rimSummaryPlot = nullptr;
-    this->firstAncestorOrThisOfType(rimSummaryPlot);
 
     if (changedField == &isAutoTitle)
     {
         updateOptionSensitivity();
     }
-    else if (changedField == &visibleRangeMax)
+
+    RimSummaryPlot* rimSummaryPlot = nullptr;
+    this->firstAncestorOrThisOfType(rimSummaryPlot);
+    if (rimSummaryPlot)
+    {
+        if (changedField == &visibleRangeMax)
         {
             if (visibleRangeMin > visibleRangeMax) visibleRangeMax = oldValue.toDouble();
         
@@ -183,6 +186,7 @@ void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* chan
         {
             rimSummaryPlot->updateAxes();
         }
+    }
 }
 
 //--------------------------------------------------------------------------------------------------