1 files changed, 6 insertions, 10 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 8df6926ee..41ad3308f 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2182,16 +2182,8 @@ int main(int argc, char **argv, char **envp) {
                                 fprintf(stderr, "Error: please provide a name for sandbox\n");
                                 return 1;
                         }
-                        const char *c = cfg.name;
-                        while (*c) {
-                                if (!isdigit(*c)) {
-                                        only_numbers = 0;
-                                        break;
-                                }
-                                ++c;
-                        }
-                        if (only_numbers) {
-                                fprintf(stderr, "Error: invalid sandbox name: it only contains digits\n");
+                        if (invalid_name(cfg.name)) {
+                                fprintf(stderr, "Error: invalid sandbox name\n");
                                 return 1;
                         }
                 }
@@ -2201,6 +2193,10 @@ int main(int argc, char **argv, char **envp) {
                                 fprintf(stderr, "Error: please provide a hostname for sandbox\n");
                                 return 1;
                         }
+                        if (invalid_name(cfg.hostname)) {
+                                fprintf(stderr, "Error: invalid hostname\n");
+                                return 1;
+                        }
                 }
                 else if (strcmp(argv[i], "--nogroups") == 0)
                         arg_nogroups = 1;