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

#2143 Guard agains access of null pointer when reading NNC

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-14 10:35:18 +01:00
parent 4e20723650
commit 1c0d8c0dd0
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -614,8 +614,11 @@ void RifReaderEclipseOutput::transferStaticNNCData(const ecl_grid_type* mainEclG
// Get the data from ERT // Get the data from ERT
ecl_nnc_geometry_type* nnc_geo = ecl_nnc_geometry_alloc(mainEclGrid); ecl_nnc_geometry_type* nnc_geo = ecl_nnc_geometry_alloc(mainEclGrid);
if (nnc_geo)
{
ecl_nnc_data_type* tran_data = ecl_nnc_data_alloc_tran(mainEclGrid, nnc_geo, ecl_file_get_global_view(init_file)); ecl_nnc_data_type* tran_data = ecl_nnc_data_alloc_tran(mainEclGrid, nnc_geo, ecl_file_get_global_view(init_file));
if (tran_data)
{
int numNNC = ecl_nnc_data_get_size(tran_data); int numNNC = ecl_nnc_data_get_size(tran_data);
int geometrySize = ecl_nnc_geometry_size(nnc_geo); int geometrySize = ecl_nnc_geometry_size(nnc_geo);
CVF_ASSERT(numNNC == geometrySize); CVF_ASSERT(numNNC == geometrySize);
@ -640,10 +643,13 @@ void RifReaderEclipseOutput::transferStaticNNCData(const ecl_grid_type* mainEclG
} }
} }
ecl_nnc_geometry_free(nnc_geo);
ecl_nnc_data_free(tran_data); ecl_nnc_data_free(tran_data);
} }
ecl_nnc_geometry_free(nnc_geo);
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------