diff options
author | 2023-02-14 11:33:35 -0500 | |
---|---|---|
committer | 2023-02-14 11:33:35 -0500 | |
commit | b4ffaa207419715a81525e48e4ceb59d471047ee (patch) | |
tree | 41dc01c1311770cc2d98f841c78b83194a9e2eaa /src/firejail/main.c | |
parent | Merge pull request #5613 from layderv/escape-cntrl-sequences (diff) | |
download | firejail-b4ffaa207419715a81525e48e4ceb59d471047ee.tar.gz firejail-b4ffaa207419715a81525e48e4ceb59d471047ee.tar.zst firejail-b4ffaa207419715a81525e48e4ceb59d471047ee.zip |
merges; more on cleaning up esc chars
Diffstat (limited to 'src/firejail/main.c')
-rw-r--r-- | src/firejail/main.c | 16 |
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) { | |||
2182 | fprintf(stderr, "Error: please provide a name for sandbox\n"); | 2182 | fprintf(stderr, "Error: please provide a name for sandbox\n"); |
2183 | return 1; | 2183 | return 1; |
2184 | } | 2184 | } |
2185 | const char *c = cfg.name; | 2185 | if (invalid_name(cfg.name)) { |
2186 | while (*c) { | 2186 | fprintf(stderr, "Error: invalid sandbox name\n"); |
2187 | if (!isdigit(*c)) { | ||
2188 | only_numbers = 0; | ||
2189 | break; | ||
2190 | } | ||
2191 | ++c; | ||
2192 | } | ||
2193 | if (only_numbers) { | ||
2194 | fprintf(stderr, "Error: invalid sandbox name: it only contains digits\n"); | ||
2195 | return 1; | 2187 | return 1; |
2196 | } | 2188 | } |
2197 | } | 2189 | } |
@@ -2201,6 +2193,10 @@ int main(int argc, char **argv, char **envp) { | |||
2201 | fprintf(stderr, "Error: please provide a hostname for sandbox\n"); | 2193 | fprintf(stderr, "Error: please provide a hostname for sandbox\n"); |
2202 | return 1; | 2194 | return 1; |
2203 | } | 2195 | } |
2196 | if (invalid_name(cfg.hostname)) { | ||
2197 | fprintf(stderr, "Error: invalid hostname\n"); | ||
2198 | return 1; | ||
2199 | } | ||
2204 | } | 2200 | } |
2205 | else if (strcmp(argv[i], "--nogroups") == 0) | 2201 | else if (strcmp(argv[i], "--nogroups") == 0) |
2206 | arg_nogroups = 1; | 2202 | arg_nogroups = 1; |