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

#931 : Avoid null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-25 09:00:52 +02:00
parent b091333daa
commit 1e7e0fdc7a
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -114,8 +114,9 @@ void getDayMonthYear(const ecl_kw_type* intehead_kw, int* day, int* month, int*
//--------------------------------------------------------------------------------------------------
void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<QDateTime>* timeSteps)
{
if (!ecl_file) return;
CVF_ASSERT(timeSteps);
CVF_ASSERT(ecl_file);
// Get the number of occurrences of the INTEHEAD keyword
int numINTEHEAD = ecl_file_get_num_named_kw(ecl_file, INTEHEAD_KW);

27
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@@ -175,6 +175,11 @@ bool RifEclipseRestartFilesetAccess::results(const QString& resultName, size_t t
openTimeStep(timeStep);
if (!m_ecl_files[timeStep])
{
return false;
}
size_t fileGridCount = ecl_file_get_num_named_kw(m_ecl_files[timeStep], resultName.toAscii().data());
// No results for this result variable for current time step found
@@ -213,11 +218,14 @@ void RifEclipseRestartFilesetAccess::readWellData(well_info_type* well_info, boo
{
openTimeStep(i);
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
int reportNumber = ecl_util_filename_report_nr(fileName);
if(reportNumber != -1)
if (m_ecl_files[i])
{
well_info_add_wells(well_info, m_ecl_files[i], reportNumber, importCompleteMswData);
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
int reportNumber = ecl_util_filename_report_nr(fileName);
if(reportNumber != -1)
{
well_info_add_wells(well_info, m_ecl_files[i], reportNumber, importCompleteMswData);
}
}
}
}
@@ -263,11 +271,14 @@ std::vector<int> RifEclipseRestartFilesetAccess::reportNumbers()
for (size_t i = 0; i < m_ecl_files.size(); i++)
{
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
int reportNumber = ecl_util_filename_report_nr(fileName);
if (reportNumber != -1)
if (m_ecl_files[i])
{
reportNr.push_back(reportNumber);
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
int reportNumber = ecl_util_filename_report_nr(fileName);
if (reportNumber != -1)
{
reportNr.push_back(reportNumber);
}
}
}