Add sbox_run_v to run programs with explicit argument lists

Refactored sbox_run to pass the varargs argument list as an array to an
auxiliary function.
The auxiliary function allows running programs with dynamically built
argument lists.

2 files changed, 18 insertions, 6 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index bfe680d24..0311968c3 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -815,6 +815,7 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
 
 // run sbox
 int sbox_run(unsigned filter, int num, ...);
+int sbox_run_v(unsigned filter, char * const arg[]);
 
 // run_files.c
 void delete_run_files(pid_t pid);
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index e5739ecb5..a90cb7668 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -105,23 +105,34 @@ static struct sock_fprog prog = {
 };
 
 int sbox_run(unsigned filtermask, int num, ...) {
-        EUID_ROOT();
-
-        int i;
         va_list valist;
         va_start(valist, num);
 
         // build argument list
-        char *arg[num + 1];
+  char **arg = malloc((num + 1) * sizeof(char *));
+  int i;
         for (i = 0; i < num; i++)
                 arg[i] = va_arg(valist, char*);
         arg[i] = NULL;
         va_end(valist);
 
+  int status = sbox_run_v(filtermask, arg); 
+
+  free(arg);
+
+  return status;
+}
+
+int sbox_run_v(unsigned filtermask, char * const arg[]) {
+        EUID_ROOT();
+
         if (arg_debug) {
                 printf("sbox run: ");
-                for (i = 0; i <= num; i++)
+    int i = 0;
+    while (arg[i]) {
                         printf("%s ", arg[i]);
+      i++;
+    }
                 printf("\n");
         }
 
@@ -171,7 +182,7 @@ int sbox_run(unsigned filtermask, int num, ...) {
 
                 // close all other file descriptors
                 int max = 20; // getdtablesize() is overkill for a firejail process
-                for (i = 3; i < max; i++)
+                for (int i = 3; i < max; i++)
                         close(i); // close open files
 
                 umask(027);