various fixes

3 files changed, 8 insertions, 2 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 0269ff585..a66e10e0f 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1268,8 +1268,8 @@ int main(int argc, char **argv) {
                                 fprintf(stderr, "Error: invalid private-bin option\n");
                                 exit(1);
                         }
-                        fs_check_bin_list();
                         arg_private_bin = 1;
+                        fs_check_bin_list();
                 }
                 else if (strcmp(argv[i], "--private-tmp") == 0) {
                         arg_private_tmp = 1;
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index d7ea4a550..d2894d463 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -385,8 +385,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         // private /bin list of files
         if (strncmp(ptr, "private-bin ", 12) == 0) {
                 cfg.bin_private_keep = ptr + 12;
-                fs_check_bin_list();
                 arg_private_bin = 1;
+                fs_check_bin_list();
                 return 0;
         }
 
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 732ebf27e..ccddeb888 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -227,8 +227,14 @@ static void start_application(void) {
                         }
                 }
 
+                if (cfg.original_program_index == 0) {
+                        fprintf(stderr, "Error: --shell=none configured, but no program specified\n");
+                        exit(1);
+                }
+
                 if (!arg_command && !arg_quiet)
                         printf("Child process initialized\n");
+
                 execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]);
         }
         //****************************************