OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#8295 Guard null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2021-11-16 14:31:49 +01:00
parent 2a65636ba3
commit 89af752fa9
1 changed files with 124 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

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