github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

Merge pull request #2130 from crass/fix-2045

Browse source 
FIX-2045: Fix command name parsing for program paths with spaces.
This commit is contained in:
netblue30 2018-10-04 07:51:38 -05:00 • committed by GitHub
commit 5b40b28eab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/firejail/util.c
View file

@ -636,33 +636,33 @@ void extract_command_name(int index, char **argv) {
if (!cfg.command_name)
errExit("strdup");
// restrict the command name to the first word
char *ptr = cfg.command_name;
while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
ptr++;
*ptr = '\0';
// remove the path: /usr/bin/firefox becomes firefox
ptr = strrchr(cfg.command_name, '/');
char *basename = cfg.command_name;
char *ptr = strrchr(cfg.command_name, '/');
if (ptr) {
ptr++;
basename = ++ptr;
if (*ptr == '\0') {
fprintf(stderr, "Error: invalid command name\n");
exit(1);
}
}
else
ptr = basename;
char *tmp = strdup(ptr);
if (!tmp)
// restrict the command name to the first word
while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
ptr++;
// command name is a substring of cfg.command_name
if (basename != cfg.command_name || *ptr != '\0') {
*ptr = '\0';
basename = strdup(basename);
if (!basename)
errExit("strdup");
// limit the command to the first ' '
char *ptr2 = tmp;
while (*ptr2 != ' ' && *ptr2 != '\0')
ptr2++;
*ptr2 = '\0';
free(cfg.command_name);
cfg.command_name = tmp;
cfg.command_name = basename;
}
}