clean gcc ananlyzer warnings - #3377

netblue30 · Sep 28, 2020 · 823dd6b · 823dd6b
1 parent c6166d7
commit 823dd6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/firejail/paths.c b/src/firejail/paths.c
@@ -45,6 +45,7 @@ static void init_paths(void) {
 	paths = calloc(path_cnt, sizeof(char *));
 	if (!paths)
 		errExit("calloc");
+	memset(paths, 0, path_cnt * sizeof(char *)); // get rid of false positive error from GCC static analyzer
 
 	// fill in 'paths' with pointers to elements of 'path'
 	unsigned int i = 0, j;

diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
@@ -263,6 +263,7 @@ int sbox_run(unsigned filtermask, int num, ...) {
 
 int sbox_run_v(unsigned filtermask, char * const arg[]) {
 	EUID_ROOT();
+	assert(arg);
 
 	if (arg_debug) {
 		printf("sbox run: ");
@@ -288,7 +289,7 @@ int sbox_run_v(unsigned filtermask, char * const arg[]) {
 	if (waitpid(child, &status, 0) == -1 ) {
 		errExit("waitpid");
 	}
-	if (WIFEXITED(status) && status != 0) {
+	if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
 		fprintf(stderr, "Error: failed to run %s\n", arg[0]);
 		exit(1);
 	}