1 files changed, 24 insertions, 0 deletions

diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index dff892ea3..56ab7c932 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -27,6 +27,8 @@ static int initialized = 0;
 static int cfg_val[CFG_MAX];
 char *xephyr_screen = "800x600";
 char *xephyr_extra_params = "";
+char *xvfb_screen = "800x600x24";
+char *xvfb_extra_params = "";
 char *netfilter_default = NULL;
 
 int checkcfg(int val) {
@@ -234,6 +236,28 @@ int checkcfg(int val) {
                                         errExit("strdup");
                         }
                         
+                        // Xvfb screen size
+                        else if (strncmp(ptr, "xvfb-screen ", 12) == 0) {
+                                // expecting three numbers separated by x's
+                                unsigned int n1;
+                                unsigned int n2;
+                                unsigned int n3;
+                                int rv = sscanf(ptr + 12, "%ux%ux%u", &n1, &n2, &n3);
+                                if (rv != 3)
+                                        goto errout;
+                                if (asprintf(&xvfb_screen, "%ux%ux%u", n1, n2, n3) == -1)
+                                        errExit("asprintf");
+                        }
+
+                        // Xvfb extra parameters
+                        else if (strncmp(ptr, "xvfb-extra-params ", 18) == 0) {
+                                if (*xvfb_extra_params != '\0')
+                                        goto errout;
+                                xvfb_extra_params = strdup(ptr + 18);
+                                if (!xvfb_extra_params)
+                                        errExit("strdup");
+                        }
+                        
                         // quiet by default
                         else if (strncmp(ptr, "quiet-by-default ", 17) == 0) {
                                 if (strcmp(ptr + 17, "yes") == 0)