Skip to content

Commit c61237f

Browse files
committed
Fixed segfault in config memory deallocation.
1 parent b74676e commit c61237f

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

Common/src/config_structure.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ void CConfig::SetPointersNull(void) {
118118
Marker_CfgFile_DV=NULL; Marker_All_DV=NULL;
119119
Marker_CfgFile_Moving=NULL; Marker_All_Moving=NULL;
120120
Marker_CfgFile_PerBound=NULL; Marker_All_PerBound=NULL; Marker_PerBound=NULL;
121-
121+
Marker_CfgFile_FSIinterface=NULL;
122+
122123
Marker_DV=NULL; Marker_Moving=NULL; Marker_Monitoring=NULL;
123124
Marker_Designing=NULL; Marker_GeoEval=NULL; Marker_Plotting=NULL;
124125
Marker_CfgFile_KindBC=NULL; Marker_All_KindBC=NULL;
@@ -136,7 +137,7 @@ void CConfig::SetPointersNull(void) {
136137
Marker_FlowLoad = NULL; Marker_Neumann = NULL;
137138
Marker_All_TagBound = NULL; Marker_CfgFile_TagBound = NULL; Marker_All_KindBC = NULL;
138139
Marker_CfgFile_KindBC = NULL; Marker_All_SendRecv = NULL; Marker_All_PerBound = NULL;
139-
Marker_FSIinterface = NULL; Marker_Riemann = NULL;
140+
Marker_FSIinterface = NULL; Marker_All_FSIinterface=NULL; Marker_Riemann = NULL;
140141
Marker_Load = NULL;
141142
/*--- Boundary Condition settings ---*/
142143

@@ -2651,17 +2652,17 @@ void CConfig::SetMarkers(unsigned short val_software) {
26512652

26522653
/*--- Allocate the memory (markers in the config file) ---*/
26532654

2654-
Marker_CfgFile_TagBound = new string[nMarker_CfgFile];
2655-
Marker_CfgFile_KindBC = new unsigned short[nMarker_CfgFile];
2656-
Marker_CfgFile_Monitoring = new unsigned short[nMarker_CfgFile];
2657-
Marker_CfgFile_Designing = new unsigned short[nMarker_CfgFile];
2658-
Marker_CfgFile_Plotting = new unsigned short[nMarker_CfgFile];
2659-
Marker_CfgFile_GeoEval = new unsigned short[nMarker_CfgFile];
2655+
Marker_CfgFile_TagBound = new string[nMarker_CfgFile];
2656+
Marker_CfgFile_KindBC = new unsigned short[nMarker_CfgFile];
2657+
Marker_CfgFile_Monitoring = new unsigned short[nMarker_CfgFile];
2658+
Marker_CfgFile_Designing = new unsigned short[nMarker_CfgFile];
2659+
Marker_CfgFile_Plotting = new unsigned short[nMarker_CfgFile];
2660+
Marker_CfgFile_GeoEval = new unsigned short[nMarker_CfgFile];
26602661
Marker_CfgFile_FSIinterface = new unsigned short[nMarker_CfgFile];
2661-
Marker_CfgFile_DV = new unsigned short[nMarker_CfgFile];
2662-
Marker_CfgFile_Moving = new unsigned short[nMarker_CfgFile];
2663-
Marker_CfgFile_PerBound = new unsigned short[nMarker_CfgFile];
2664-
Marker_CfgFile_Out_1D = new unsigned short[nMarker_CfgFile];
2662+
Marker_CfgFile_DV = new unsigned short[nMarker_CfgFile];
2663+
Marker_CfgFile_Moving = new unsigned short[nMarker_CfgFile];
2664+
Marker_CfgFile_PerBound = new unsigned short[nMarker_CfgFile];
2665+
Marker_CfgFile_Out_1D = new unsigned short[nMarker_CfgFile];
26652666

26662667
for (iMarker_CfgFile = 0; iMarker_CfgFile < nMarker_CfgFile; iMarker_CfgFile++) {
26672668
Marker_CfgFile_TagBound[iMarker_CfgFile] = "SEND_RECEIVE";

Common/src/geometry_structure.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5834,8 +5834,8 @@ void CPhysicalGeometry::Read_CGNS_Format_Parallel(CConfig *config, string val_me
58345834
int** dataSize = NULL;
58355835
bool** isInternal = NULL;
58365836
char*** sectionNames = NULL;
5837-
int indexElem = 0;
5838-
int indexElemMaster = 0;
5837+
// int indexElem = 0;
5838+
// int indexElemMaster = 0;
58395839

58405840
/*--- Initialize counters for local/global points & elements ---*/
58415841

@@ -6552,7 +6552,7 @@ void CPhysicalGeometry::Read_CGNS_Format_Parallel(CConfig *config, string val_me
65526552
for (int jj = 0; jj < elemIndex[j-1][s-1]; jj++) {
65536553
connElems[j-1][s-1][jj] = new cgsize_t[nElems[j-1][s-1]];
65546554
}
6555-
indexElemMaster = elemIndex[j-1][s-1];
6555+
//indexElemMaster = elemIndex[j-1][s-1];
65566556

65576557
/*--- Retrieve the connectivity information and store. ---*/
65586558

@@ -6841,7 +6841,7 @@ void CPhysicalGeometry::Read_CGNS_Format_Parallel(CConfig *config, string val_me
68416841
connElems[j-1][s-1][jj][ii] = (cgsize_t)connRecv[ii*connSize+jj];
68426842
}
68436843
}
6844-
indexElem = connSize;
6844+
//indexElem = connSize;
68456845

68466846
/*--- Store the total number of elements I now have for
68476847
the current section after completing the communications. ---*/

0 commit comments

Comments
 (0)