Merge branch 'master' of https://github.com/netblue30/firejail

3 files changed, 7 insertions, 3 deletions

diff --git a/README.md b/README.md
index 12ff8df21..b6e3026c0 100644
--- a/README.md
+++ b/README.md
@@ -149,13 +149,13 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
               Example:
               $ firejail --keep-dev-shm --private-dev
 
-     --nou2f
+       --nou2f
               Disable U2F devices.
 
               Example:
               $ firejail --nou2f
 
-      --private-cache
+       --private-cache
                Mount an empty temporary filesystem on top of the .cache
                directory in user home. All modifications are discarded
                when the sandbox is closed.
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 501188ca7..77c9a0cf5 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -246,6 +246,7 @@ static void install_list_entry(const char *lib) {
 
 
 void fslib_install_list(const char *lib_list) {
+        assert(lib_list);
         if (arg_debug || arg_debug_private_lib)
                 printf("    fslib_install_list  %s\n", lib_list);
 
@@ -353,7 +354,7 @@ void fs_private_lib(void) {
         }
 
         // for private-bin files
-        if (arg_private_bin) {
+        if (arg_private_bin && cfg.bin_private_lib && *cfg.bin_private_lib != '\0') {
                 if (arg_debug || arg_debug_private_lib)
                         printf("Processing private-bin files\n");
                 fslib_install_list(cfg.bin_private_lib);
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
index e404fbec7..e22ff7b17 100755
--- a/test/fs/whitelist-dev.exp
+++ b/test/fs/whitelist-dev.exp
@@ -56,6 +56,9 @@ expect {
         "16" {puts "OK\n"}
         "17" {puts "OK\n"}
         "18" {puts "OK\n"}
+        "19" {puts "OK\n"}
+        "20" {puts "OK\n"}
+        "21" {puts "OK\n"}
 }
 after 100