aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2022-01-09 01:03:49 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2022-01-09 10:17:02 +0100
commit6cb69a40c757cc44906fd928c43e60612c0e7ce8 (patch)
tree04401253548aec28c76707f99b3c7f8fed6d32e8 /common
parentDestroy sub-surfaces with parent layer-shell surface (diff)
downloadsway-6cb69a40c757cc44906fd928c43e60612c0e7ce8.tar.gz
sway-6cb69a40c757cc44906fd928c43e60612c0e7ce8.tar.zst
sway-6cb69a40c757cc44906fd928c43e60612c0e7ce8.zip
Add safety assert in parse_movement_unit
Let's add this just in case a caller passes argc == 0. References: https://github.com/swaywm/sway/issues/6737#issuecomment-1008082540
Diffstat (limited to 'common')
-rw-r--r--common/util.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/util.c b/common/util.c
index 199f3ee1..5d4c0673 100644
--- a/common/util.c
+++ b/common/util.c
@@ -80,6 +80,12 @@ enum movement_unit parse_movement_unit(const char *unit) {
80 80
81int parse_movement_amount(int argc, char **argv, 81int parse_movement_amount(int argc, char **argv,
82 struct movement_amount *amount) { 82 struct movement_amount *amount) {
83 if (!sway_assert(argc > 0, "Expected args in parse_movement_amount")) {
84 amount->amount = 0;
85 amount->unit = MOVEMENT_UNIT_INVALID;
86 return 0;
87 }
88
83 char *err; 89 char *err;
84 amount->amount = (int)strtol(argv[0], &err, 10); 90 amount->amount = (int)strtol(argv[0], &err, 10);
85 if (*err) { 91 if (*err) {