From 3a2ca11095d5733af3fa1f48d60a9acc7f1cac8f Mon Sep 17 00:00:00 2001
From: smitsohu <smitsohu@gmail.com>
Date: Sat, 5 May 2018 17:38:55 +0200
Subject: tiny memleaks, np dereference

---
 src/firecfg/desktop_files.c | 8 ++++++--
 src/firejail/fs_lib.c       | 2 +-
 src/firejail/fs_whitelist.c | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index eb3794d3f..71b39390e 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -65,10 +65,14 @@ static int have_profile(const char *filename, const char *homedir) {
 
 	// check .desktop extension
 	int len = strlen(tmpfname);
-	if (len <= 8)
+	if (len <= 8) {
+		free(tmpfname);
 		return 0;
-	if (strcmp(tmpfname + len - 8, ".desktop"))
+	}
+	if (strcmp(tmpfname + len - 8, ".desktop")) {
+		free(tmpfname);
 		return 0;
+	}
 	tmpfname[len - 8] = '\0';
 
 	// extract last word
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 363b48d1d..4f8a98fe4 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -367,8 +367,8 @@ void fs_private_lib(void) {
 					free(name);
 				}
 			}
+			fclose(fp);
 		}
-		fclose(fp);
 	}
 	fmessage("Program libraries installed in %0.2f ms\n", timetrace_end());
 
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 754714943..3e093f616 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -888,6 +888,7 @@ void fs_whitelist(void) {
 							fprintf(stderr, "Error: invalid symbolic link %s\n", entry->link);
 							exit(1);
 						}
+						free(path);
 					}
 				}
 			}
-- 
cgit v1.2.3-54-g00ecf