From 2a0197cb08ea78eb4aefae54a1f7760f0477414e Mon Sep 17 00:00:00 2001
From: Martin Perry <martin.perry@bull.com>
Date: Fri, 9 May 2014 12:57:23 -0700
Subject: [PATCH] Fix two memory leaks in jobacct_gather_cgroup.c
---
src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c b/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c
index 5ecebc2d00d..dcc1ba26147 100644
--- a/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c
+++ b/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c
@@ -105,8 +105,8 @@ static slurm_cgroup_conf_t slurm_cgroup_conf;
static void _prec_extra(jag_prec_t *prec)
{
unsigned long utime, stime, total_rss, total_pgpgin;
- char *cpu_time, *memory_stat, *ptr;
- size_t cpu_time_size, memory_stat_size;
+ char *cpu_time = NULL, *memory_stat = NULL, *ptr;
+ size_t cpu_time_size = 0, memory_stat_size = 0;
//DEF_TIMERS;
@@ -135,6 +135,8 @@ static void _prec_extra(jag_prec_t *prec)
sscanf(ptr, "total_pgmajfault %lu", &total_pgpgin);
prec->pages = total_pgpgin;
}
+ xfree(cpu_time);
+ xfree(memory_stat);
/* FIXME: Enable when kernel support ready.
*
--
GitLab