alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add safety assert in parse_movement_unit

Browse source 
Let's add this just in case a caller passes argc == 0.

References: https://github.com/swaywm/sway/issues/6737#issuecomment-1008082540
(cherry picked from commit 6cb69a40c757cc44906fd928c43e60612c0e7ce8)
This commit is contained in:
Simon Ser 2022-01-09 01:03:49 +01:00
parent 6859861998
commit e0a591fb93
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/util.c
View file

@ -80,6 +80,12 @@ enum movement_unit parse_movement_unit(const char *unit) {
int parse_movement_amount(int argc, char **argv, int parse_movement_amount(int argc, char **argv,
struct movement_amount *amount) { struct movement_amount *amount) {
if (!sway_assert(argc > 0, "Expected args in parse_movement_amount")) {
amount->amount = 0;
amount->unit = MOVEMENT_UNIT_INVALID;
return 0;
}
char *err; char *err;
amount->amount = (int)strtol(argv[0], &err, 10); amount->amount = (int)strtol(argv[0], &err, 10);
if (*err) { if (*err) {