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

Merge pull request #4086 from bska/dont-deref-nullptr

Browse Source 
Max 2P Sat-Sum: Don't Dereference Null Pointer
This commit is contained in:
Magne Sjaastad 2019-02-14 07:09:56 +01:00 committed by GitHub
commit 83620e85fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLSaturationFunc.cpp vendored
View File

@ -2477,7 +2477,10 @@ max2PSatSum(const RawCurve& fi,
} }
} }
else { else {
const auto swco = this->wat_->swco(); const auto swco = (this->wat_ != nullptr)
? this->wat_->swco()
: std::vector<double>(this->numTables_, 0.0);
smin = swco[regID - 1]; smin = swco[regID - 1];
} }
} }
@ -2494,7 +2497,10 @@ max2PSatSum(const RawCurve& fi,
} }
} }
else { else {
const auto sgco = this->gas_->sgco(); const auto sgco = (this->gas_ != nullptr)
? this->gas_->sgco()
: std::vector<double>(this->numTables_, 0.0);
smin = sgco[regID - 1]; smin = sgco[regID - 1];
} }
} }