Skip to content

Commit 0cd28d0

Browse files
Michael DunphyMichael Dunphy
authored andcommitted
Three fixes:
* Fix free in AddToMasterParamList * Free p in ParseClassPropertiesFile * Initialize g.alb_decay_melt in CGlobalParams::InitializeGlobalParameters
1 parent e65cce4 commit 0cd28d0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/GlobalParams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ void CGlobalParams::InitializeGlobalParameters(global_struct &g, bool is_templat
404404
g.max_snow_albedo =DefaultParameterValue(is_template,true);
405405
g.min_snow_albedo =DefaultParameterValue(is_template,true);
406406
g.alb_decay_cold =DefaultParameterValue(is_template,true);
407-
g.alb_decay_cold =DefaultParameterValue(is_template,true);
407+
g.alb_decay_melt =DefaultParameterValue(is_template,true);
408408
g.bare_ground_albedo =DefaultParameterValue(is_template,true);
409409
g.snowfall_albthresh =DefaultParameterValue(is_template,true);
410410

src/ParsePropertyFile.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,6 +1543,7 @@ bool ParseClassPropertiesFile(CModel *&pModel,
15431543

15441544
delete [] indices;
15451545
for (int i=0;i<MAX_NUM_IN_CLASS;i++){delete [] properties[i];}delete [] properties;
1546+
delete p;
15461547

15471548
return true;
15481549
}
@@ -1698,7 +1699,7 @@ void AddToMasterParamList (string *&aPm, class_type *&aPCm, int
16981699
aPCm_new[nPm+i]=aPC[i];
16991700
}
17001701
if (aPm!=NULL){delete [] aPm; aPm=NULL;}
1701-
if (aPm!=NULL){delete [] aPCm;aPCm=NULL;}
1702+
if (aPCm!=NULL){delete [] aPCm;aPCm=NULL;}
17021703
aPm =aPm_new;
17031704
aPCm=aPCm_new;
17041705
nPm=nPm+nP;

0 commit comments

Comments
 (0)