From f96a597321c02547dec0db3d78cbf441c798c9dd Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 25 Aug 2020 13:13:53 +0200 Subject: [PATCH] Guard nullpointer access Seen when running regression test ProjectFiles\CommandFileTests\TestCase_Multiple_Fractures and rest of tests in this folder --- ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp index e3b1bf5ea0..36ff2b0e58 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -166,9 +166,9 @@ void Rim2dIntersectionView::scheduleGeometryRegen( RivCellSetEnum geometryType ) RimCase* Rim2dIntersectionView::ownerCase() const { RimCase* rimCase = nullptr; - if ( RimIntersectionResultDefinition* sepInterResultDef = m_intersection->activeSeparateResultDefinition() ) + if ( m_intersection && m_intersection->activeSeparateResultDefinition() ) { - rimCase = sepInterResultDef->activeCase(); + rimCase = m_intersection->activeSeparateResultDefinition()->activeCase(); } if ( !rimCase )