From 8765dfa3ab0933e962164226dd6351b37c49fc20 Mon Sep 17 00:00:00 2001 From: Lew Rossman Date: Tue, 5 Mar 2019 20:50:34 -0500 Subject: [PATCH] Initialize all file pointers to NULL in initpointers --- src/epanet.c | 4 ++-- src/project.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/epanet.c b/src/epanet.c index 383bd6f..57952ec 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -819,13 +819,13 @@ int DLLEXPORT EN_closeQ(EN_Project p) if (!p->Openflag) return 102; closequal(p); p->quality.OpenQflag = FALSE; -/* + if (p->outfile.OutFile != NULL) { fclose(p->outfile.OutFile); p->outfile.OutFile = NULL; } -*/ + return 0; } diff --git a/src/project.c b/src/project.c index b66117c..4de0736 100644 --- a/src/project.c +++ b/src/project.c @@ -265,6 +265,12 @@ void initpointers(Project *pr) pr->hydraul.smatrix.XLNZ = NULL; pr->hydraul.smatrix.NZSUB = NULL; pr->hydraul.smatrix.LNZ = NULL; + + pr->outfile.OutFile = NULL; + pr->outfile.HydFile = NULL; + pr->outfile.TmpOutFile = NULL; + pr->parser.InFile = NULL; + pr->report.RptFile = NULL; initrules(pr); }