#8295 Guard null pointer access

This commit is contained in:
Magne Sjaastad 2021-11-16 14:31:49 +01:00
parent a7308127bb
commit 5e2129a93b

View File

@ -486,15 +486,13 @@ std::vector<double>
WellFractureIntersectionData
RimStimPlanFractureTemplate::wellFractureIntersectionData( const RimFracture* fractureInstance ) const
{
if ( !fractureInstance || !fractureInstance->fractureGrid() ) return {};
WellFractureIntersectionData values;
const RigFractureGrid* fractureGrid = fractureInstance->fractureGrid();
if ( fractureGrid )
{
if ( orientationType() == ALONG_WELL_PATH )
{
CVF_ASSERT( fractureInstance );
RimWellPath* rimWellPath = nullptr;
fractureInstance->firstAncestorOrThisOfType( rimWellPath );
@ -527,8 +525,7 @@ WellFractureIntersectionData
std::vector<double> betaFactorResultValues;
{
auto nameUnit = betaFactorParameterNameAndUnit();
betaFactorResultValues =
m_stimPlanFractureDefinitionData->fractureGridResults( nameUnit.first,
betaFactorResultValues = m_stimPlanFractureDefinitionData->fractureGridResults( nameUnit.first,
nameUnit.second,
m_activeTimeStepIndex );
}
@ -625,8 +622,7 @@ WellFractureIntersectionData
if ( widthInRequiredUnit != HUGE_VAL && fabs( widthInRequiredUnit ) > 1e-20 )
{
values.m_width = widthInRequiredUnit;
values.m_permeability =
RigTransmissibilityEquations::permeability( conductivity, widthInRequiredUnit );
values.m_permeability = RigTransmissibilityEquations::permeability( conductivity, widthInRequiredUnit );
}
}
}
@ -649,7 +645,6 @@ WellFractureIntersectionData
}
}
}
}
return values;
}