Skip to contentSkip to conversation

cpupower: fix potential memory leak

PATCH In review Arjun Sreedharan 1 participant 2 messages Aug 22, 2015 – Sep 11, 2015 CPU power monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpupower: fix potential memory leak

---
 tools/power/cpupower/bench/parse.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
tools/power/cpupower/bench/parse.c +6 -4
index f503fb5..058a351 100644
@@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
 {
 	FILE *output = NULL;
 	int len;
-	char *filename;
+	char *filename, *filename_tmp;
 	struct utsname sysdata;
 	DIR *dir;
 
@@ -80,17 +80,19 @@ FILE *prepare_output(const char *dirname)
 	}
 
 	len = strlen(dirname) + 30;
-	filename = malloc(sizeof(char) * len);
+	filename = malloc(sizeof(*filename) * len);
 
 	if (uname(&sysdata) == 0) {
 		len += strlen(sysdata.nodename) + strlen(sysdata.release);
-		filename = realloc(filename, sizeof(char) * len);
+		filename_tmp = realloc(filename, sizeof(*filename) * len);
 
-		if (filename == NULL) {
+		if (filename_tmp == NULL) {
+			free(filename);
 			perror("realloc");
 			return NULL;
 		}
 
+		filename = filename_tmp;
 		snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
 			dirname, sysdata.nodename, sysdata.release, time(NULL));
 	} else {
Signature · 1 line
2.4.5
#1 lore raw

Ping !

Quoted 44 lines · Arjun Sreedharan
---
 tools/power/cpupower/bench/parse.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
tools/power/cpupower/bench/parse.c +6 -5
index f503fb5..058a351 100644
@@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
 {
        FILE *output = NULL;
        int len;
-       char *filename;
+       char *filename, *filename_tmp;
        struct utsname sysdata;
        DIR *dir;
 
@@ -80,17 +80,19 @@ FILE *prepare_output(const char *dirname)
        }
 
        len = strlen(dirname) + 30;
-       filename = malloc(sizeof(char) * len);
+       filename = malloc(sizeof(*filename) * len);
 
        if (uname(&sysdata) == 0) {
                len += strlen(sysdata.nodename) + strlen(sysdata.release);
-               filename = realloc(filename, sizeof(char) * len);
+               filename_tmp = realloc(filename, sizeof(*filename) * len);
 
-               if (filename == NULL) {
+               if (filename_tmp == NULL) {
+                       free(filename);
                        perror("realloc");
                        return NULL;
                }
 
+               filename = filename_tmp;
                snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
                        dirname, sysdata.nodename, sysdata.release, time(NULL));
        } else {
--

2.4.5

Signature · 2 lines
Arjun Sreedharan
arjunsreedharan.org