Fix: Memory leak when zmalloc fail on kernel channel allocation

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 7d537d1f6d654ab5dce83fa65adf333ed14e4bf4..7439c1cdcf4d0fac711f7a5f4acfbd018a83a773 100644 (file)
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -65,9 +65,7 @@ static FILE *open_config(char *path, const char *mode)
        }
 
 error:
-       if (file_path) {
-               free(file_path);
-       }
+       free(file_path);
        return fp;
 }
 
@@ -116,7 +114,9 @@ static int write_config(char *file_path, size_t size, char *data)
        if (len != 1) {
                ret = -1;
        }
-       fclose(fp);
+       if (fclose(fp)) {
+               PERROR("close write_config");
+       }
 end:
        return ret;
 }
@@ -203,6 +203,7 @@ char *config_read_session_name(char *path)
        if (fp == NULL) {
                ERR("Can't find valid lttng config %s/.lttngrc", path);
                MSG("Did you create a session? (lttng create <my_session>)");
+               free(session_name);
                goto error;
        }
 
@@ -221,13 +222,20 @@ char *config_read_session_name(char *path)
        }
 
 error_close:
-       fclose(fp);
+       free(session_name);
+       ret = fclose(fp);
+       if (ret < 0) {
+               PERROR("close config read session name");
+       }
 
 error:
        return NULL;
 
 found:
-       fclose(fp);
+       ret = fclose(fp);
+       if (ret < 0) {
+               PERROR("close config read session name found");
+       }
        return session_name;
 
 }