diff options
author | netblue30 <netblue30@yahoo.com> | 2017-04-06 10:25:01 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-04-06 10:25:01 -0400 |
commit | 519c68b857fba0822919b11e1ef66ed7216e3404 (patch) | |
tree | 65547ce56e8de6241d60bd24b0c12d5b846d04a9 /src | |
parent | RELNOTES update (diff) | |
download | firejail-519c68b857fba0822919b11e1ef66ed7216e3404.tar.gz firejail-519c68b857fba0822919b11e1ef66ed7216e3404.tar.zst firejail-519c68b857fba0822919b11e1ef66ed7216e3404.zip |
testing
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/fs_whitelist.c | 4 | ||||
-rw-r--r-- | src/firejail/util.c | 1 | ||||
-rw-r--r-- | src/firejail/x11.c | 1 |
3 files changed, 5 insertions, 1 deletions
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) { | |||
567 | free(fname); | 567 | free(fname); |
568 | entry = entry->next; | 568 | entry = entry->next; |
569 | } | 569 | } |
570 | |||
571 | // release nowhitelist memory | ||
572 | assert(nowhitelist); | ||
573 | free(nowhitelist); | ||
570 | 574 | ||
571 | // /home/user | 575 | // /home/user |
572 | if (home_dir) { | 576 | 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) { | |||
421 | 421 | ||
422 | void check_unsigned(const char *str, const char *msg) { | 422 | void check_unsigned(const char *str, const char *msg) { |
423 | EUID_ASSERT(); | 423 | EUID_ASSERT(); |
424 | int rv = 0; | ||
425 | const char *ptr = str; | 424 | const char *ptr = str; |
426 | while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0') { | 425 | while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0') { |
427 | if (!isdigit(*ptr)) { | 426 | 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) { | |||
356 | (void) rv; | 356 | (void) rv; |
357 | } | 357 | } |
358 | 358 | ||
359 | assert(display_str); | ||
359 | setenv("DISPLAY", display_str, 1); | 360 | setenv("DISPLAY", display_str, 1); |
360 | // run attach command | 361 | // run attach command |
361 | jail = fork(); | 362 | jail = fork(); |