Guard null pointer use

OPM · Nov 10, 2023 · f49053c · f49053c
1 parent 32a878a
commit f49053c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp
@@ -38,8 +38,10 @@ CAF_CMD_SOURCE_INIT( RicNewPolygonFilter3dviewFeature, "RicNewPolygonFilter3dvie
 void RicNewPolygonFilter3dviewFeature::onActionTriggered( bool isChecked )
 {
     // Get the selected Cell Filter Collection
-    RimGridView*             viewOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
-    RimCellFilterCollection* filtColl             = viewOrComparisonView->cellFilterCollection();
+    RimGridView* viewOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
+    if ( !viewOrComparisonView ) return;
+
+    RimCellFilterCollection* filtColl = viewOrComparisonView->cellFilterCollection();
 
     // and the case to use
     RimCase* sourceCase = viewOrComparisonView->ownerCase();

diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewRangeFilterSlice3dviewFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewRangeFilterSlice3dviewFeature.cpp
@@ -41,6 +41,7 @@ bool RicNewRangeFilterSlice3dviewFeature::isCommandEnabled() const
     if ( !view ) return false;
 
     RimGridView* viewOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
+    if ( !viewOrComparisonView ) return false;
 
     RimViewController* vc = viewOrComparisonView->viewController();
     if ( !vc ) return true;
@@ -58,6 +59,7 @@ void RicNewRangeFilterSlice3dviewFeature::onActionTriggered( bool isChecked )
 
     RimGridView* activeView           = RiaApplication::instance()->activeGridView();
     RimGridView* viewOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
+    if ( !viewOrComparisonView ) return;
 
     RimCase* sourceCase = viewOrComparisonView->ownerCase();