From f49053c61de4364a26ca45aedfff574e6b8de739 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 9 Nov 2023 08:57:58 +0100 Subject: [PATCH] Guard null pointer use --- .../CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp | 6 ++++-- .../RicNewRangeFilterSlice3dviewFeature.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp b/ApplicationLibCode/Commands/CellFilterCommands/RicNewPolygonFilter3dviewFeature.cpp index 20b07254e8..52db3a8110 100644 --- 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 index fba1a94bc4..f595655460 100644 --- 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();