From 519c68b857fba0822919b11e1ef66ed7216e3404 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Thu, 6 Apr 2017 10:25:01 -0400
Subject: testing

---
 src/firejail/fs_whitelist.c | 4 ++++
 src/firejail/util.c         | 1 -
 src/firejail/x11.c          | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 59dff5517..43a9269ff 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -567,6 +567,10 @@ void fs_whitelist(void) {
 		free(fname);
 		entry = entry->next;
 	}
+	
+	// release nowhitelist memory
+	assert(nowhitelist);
+	free(nowhitelist);
 		
 	// /home/user
 	if (home_dir) {
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 88fa67183..901ea87db 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -421,7 +421,6 @@ char *split_comma(char *str) {
 
 void check_unsigned(const char *str, const char *msg) {
 	EUID_ASSERT();
-	int rv = 0;
 	const char *ptr = str;
 	while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0') {
 		if (!isdigit(*ptr)) {
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index b72b46f0d..da881f344 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -356,6 +356,7 @@ void x11_start_xvfb(int argc, char **argv) {
 		(void) rv;
 	}
 
+	assert(display_str);
 	setenv("DISPLAY", display_str, 1);
 	// run attach command
 	jail = fork();
-- 
cgit v1.2.3-70-g09d2