mirror of
https://github.com/swaywm/sway.git
synced 2025-11-08 13:29:50 -05:00
output_cmd_background: fix no file + valid mode
If output_cmd_background is given a valid mode as the first argument, then there is no file given and an error should be returned. join_args should not be called with an argc of zero since it sets the last character to the null terminator. With an argc of zero, the length is zero causing a heap buffer overflow when setting the byte before the start of argv to '\0'. This probably will not ever generate a segfault, but may cause data corruption to whatever is directly before it in memory. To make other such cases easier to detect, this also adds a sway_assert in join_args when argc is zero.
This commit is contained in:
parent
09c2a46b3d
commit
89afb761ba
2 changed files with 6 additions and 0 deletions
|
|
@ -61,6 +61,9 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
|
|||
return cmd_results_new(CMD_INVALID,
|
||||
"Missing background scaling mode.");
|
||||
}
|
||||
if (j == 0) {
|
||||
return cmd_results_new(CMD_INVALID, "Missing background file");
|
||||
}
|
||||
|
||||
wordexp_t p = {0};
|
||||
char *src = join_args(argv, j);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue