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

#5457 Bubble Plot : Guard null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2020-02-03 13:44:45 +01:00
parent 7148bd73ae
commit 15aeb8036e
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@@ -36,6 +36,8 @@
#include "RimSimWellInViewCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "cvfAssert.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -96,13 +98,15 @@ bool RimSimWellInViewTools::isInjector( RimSimWellInView* well )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimSimWellInViewTools::extractValueForTimeStep( RimGridSummaryCase* gridSummaryCase,
const QString& wellName,
const std::string& vectorName,
const QDateTime& currentDate,
bool* isOk )
double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface* summaryReader,
const QString& wellName,
const std::string& vectorName,
const QDateTime& currentDate,
bool* isOk )
{
CVF_ASSERT( summaryReader );
if ( vectorName.empty() )
{
*isOk = true;
@@ -124,8 +128,7 @@ double RimSimWellInViewTools::extractValueForTimeStep( RimGridSummaryCase* gridS
false,
-1 );
RifSummaryReaderInterface* reader = gridSummaryCase->summaryReader();
if ( !gridSummaryCase->summaryReader()->hasAddress( addr ) )
if ( !summaryReader->hasAddress( addr ) )
{
// TODO: better error handling
std::cerr << "ERROR: no address found for well " << wellName.toStdString() << " " << vectorName << std::endl;
@@ -134,8 +137,8 @@ double RimSimWellInViewTools::extractValueForTimeStep( RimGridSummaryCase* gridS
}
std::vector<double> values;
reader->values( addr, &values );
std::vector<time_t> timeSteps = reader->timeSteps( addr );
summaryReader->values( addr, &values );
std::vector<time_t> timeSteps = summaryReader->timeSteps( addr );
RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( values, timeSteps );