mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-05 03:47:54 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

sway/commands: Handle incorrect resize unit

Browse source 
problem: an invalid usage of the command `resize set` will cause sway
to crash because it doesn't check for an invalid height.

solution:
1. validate height along with width
2. collect all the resize returns into a var in order to log potential
   errors before returning, so the user has more context as to why the
   resize config did not work.

fixes #8619
This commit is contained in:
Furkan Sahin 2025-03-31 20:37:37 -04:00
parent a25645a5a6
commit d302b541f7
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/commands/resize.c
View file

@ -1,4 +1,3 @@
#include <errno.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include <stdbool.h> #include <stdbool.h>
@ -457,7 +456,7 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
if (argc > num_consumed_args) { if (argc > num_consumed_args) {
return cmd_results_new(CMD_INVALID, "%s", usage); return cmd_results_new(CMD_INVALID, "%s", usage);
} }
if (width.unit == MOVEMENT_UNIT_INVALID) { if (height.unit == MOVEMENT_UNIT_INVALID) {
return cmd_results_new(CMD_INVALID, "%s", usage); return cmd_results_new(CMD_INVALID, "%s", usage);
} }
} }
@ -582,17 +581,16 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
} }
if (strcasecmp(argv[0], "set") == 0) { if (strcasecmp(argv[0], "set") == 0) {
return cmd_resize_set(argc - 1, &argv[1]); error = cmd_resize_set(argc - 1, &argv[1]);
} }
if (strcasecmp(argv[0], "grow") == 0) { else if (strcasecmp(argv[0], "grow") == 0) {
return cmd_resize_adjust(argc - 1, &argv[1], 1); error = cmd_resize_adjust(argc - 1, &argv[1], 1);
} }
if (strcasecmp(argv[0], "shrink") == 0) { else if (strcasecmp(argv[0], "shrink") == 0) {
return cmd_resize_adjust(argc - 1, &argv[1], -1); error = cmd_resize_adjust(argc - 1, &argv[1], -1);
} }
if (error->status == CMD_INVALID) {
const char usage[] = "Expected 'resize <shrink|grow> " sway_log(SWAY_ERROR, "Invalid resize command: '%s'", error->error);
"<width|height|up|down|left|right> [<amount>] [px|ppt]'"; }
return error;
return cmd_results_new(CMD_INVALID, "%s", usage);
} }