OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#14632 Guard against out-of-range time step index when loading results

Browse Source 
A case in an ensemble can have fewer time steps than the case defining the time step axis of a statistics case. The time step index was used to index m_cellScalarResults directly, reading past the end of the vector in Release where CAF_ASSERT is a no-op.
This commit is contained in:
Magne Sjaastad
2026-08-28 07:15:47 +02:00
parent 6d7959d150
commit 5f0c3f8a54
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ReservoirDataModel/ResultCalculators/RigSoilResultCalculator.cpp
+9 -16
View File
@@ -94,10 +94,7 @@ void RigSoilResultCalculator::calculate( const RigEclipseResultAddress& resVarAd
timeStepIndex );
// Early exit if none of SWAT or SGAS is present
if ( scalarIndexSWAT == cvf::UNDEFINED_SIZE_T && scalarIndexSGAS == cvf::UNDEFINED_SIZE_T )
{
return;
}
if ( scalarIndexSWAT == cvf::UNDEFINED_SIZE_T && scalarIndexSGAS == cvf::UNDEFINED_SIZE_T ) return;
size_t soilResultValueCount = 0;
size_t soilTimeStepCount = 0;
@@ -124,8 +121,13 @@ void RigSoilResultCalculator::calculate( const RigEclipseResultAddress& resVarAd
}
}
// The result may be present in metadata but unavailable for this time step.
if ( soilResultValueCount == 0 ) return;
// Make sure memory is allocated for the new SOIL results
size_t soilResultScalarIndex = m_resultsData->findScalarResultIndexFromAddress( resVarAddr );
if ( soilResultScalarIndex == cvf::UNDEFINED_SIZE_T ) return;
m_resultsData->m_cellScalarResults[soilResultScalarIndex].resize( soilTimeStepCount );
if ( !m_resultsData->cellScalarResults( resVarAddr, timeStepIndex ).empty() )
@@ -143,28 +145,19 @@ void RigSoilResultCalculator::calculate( const RigEclipseResultAddress& resVarAd
if ( scalarIndexSWAT != cvf::UNDEFINED_SIZE_T )
{
swatForTimeStep = &( m_resultsData->cellScalarResults( SWATAddr, timeStepIndex ) );
if ( swatForTimeStep->empty() )
{
swatForTimeStep = nullptr;
}
if ( swatForTimeStep->empty() ) swatForTimeStep = nullptr;
}
if ( scalarIndexSGAS != cvf::UNDEFINED_SIZE_T )
{
sgasForTimeStep = &( m_resultsData->cellScalarResults( SGASAddr, timeStepIndex ) );
if ( sgasForTimeStep->empty() )
{
sgasForTimeStep = nullptr;
}
if ( sgasForTimeStep->empty() ) sgasForTimeStep = nullptr;
}
if ( scalarIndexSSOL != cvf::UNDEFINED_SIZE_T )
{
ssolForTimeStep = &( m_resultsData->cellScalarResults( SSOLAddr, timeStepIndex ) );
if ( ssolForTimeStep->empty() )
{
ssolForTimeStep = nullptr;
}
if ( ssolForTimeStep->empty() ) ssolForTimeStep = nullptr;
}
std::vector<double>* soilForTimeStep = m_resultsData->modifiableCellScalarResult( resVarAddr, timeStepIndex );
ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp
+13 -2
View File
@@ -1765,7 +1765,11 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig
if ( mustBeCalculated( soilScalarResultIndex ) )
{
m_cellScalarResults[soilScalarResultIndex].resize( maxTimeStepCount() );
// A case in an ensemble can have fewer time steps than the case defining the time step axis
const size_t timeStepCount = maxTimeStepCount();
if ( timeStepIndex >= timeStepCount ) return cvf::UNDEFINED_SIZE_T;
m_cellScalarResults[soilScalarResultIndex].resize( timeStepCount );
std::vector<double>& values = m_cellScalarResults[soilScalarResultIndex][timeStepIndex];
if ( values.empty() )
@@ -1782,7 +1786,11 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig
if ( mustBeCalculated( sgasScalarResultIndex ) )
{
m_cellScalarResults[sgasScalarResultIndex].resize( maxTimeStepCount() );
// A case in an ensemble can have fewer time steps than the case defining the time step axis
const size_t timeStepCount = maxTimeStepCount();
if ( timeStepIndex >= timeStepCount ) return cvf::UNDEFINED_SIZE_T;
m_cellScalarResults[sgasScalarResultIndex].resize( timeStepCount );
if ( m_cellScalarResults[sgasScalarResultIndex][timeStepIndex].empty() )
{
@@ -1817,6 +1825,9 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig
if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE && timeStepCount > 0 )
{
// A case in an ensemble can have fewer time steps than the case defining the time step axis
if ( timeStepIndex >= timeStepCount ) return cvf::UNDEFINED_SIZE_T;
m_cellScalarResults[scalarResultIndex].resize( timeStepCount );
std::vector<double>& values = m_cellScalarResults[scalarResultIndex][timeStepIndex];