Fix file and memory resource leak on error exit in idlestat_load

The error returns in idlestat_load fail to close an open file and
free allocated memory on the heap. This patch addresses this.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

1 files changed, 11 insertions, 3 deletions

diff --git a/idlestat.c b/idlestat.c
index 739f6dc..0961463 100644
--- a/idlestat.c
+++ b/idlestat.c
@@ -396,16 +396,24 @@ static struct cpuidle_datas *idlestat_load(const char *path)
 		sscanf(buffer, "cpus=%u", &nrcpus);
 	}
 
-	if (!nrcpus)
+	if (!nrcpus) {
+		fclose(f);
 		return ptrerror("read error for 'cpus=' in trace file");
+	}
 
 	datas = malloc(sizeof(*datas));
-	if (!datas)
+	if (!datas) {
+		fclose(f);
 		return ptrerror("malloc datas");
+	}
 
 	datas->cstates = calloc(sizeof(*datas->cstates), nrcpus);
-	if (!datas->cstates)
+	if (!datas->cstates) {
+		free(datas);
+		fclose(f);
 		return ptrerror("calloc cstate");
+	}
+
 	/* initialize cstate_max for each cpu */
 	for (cpu = 0; cpu < nrcpus; cpu++)
 		datas->cstates[cpu].cstate_max = -1;