From b4b274cdcea5269fc39ef9c846157d211f79eec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 5 Jun 2019 18:26:12 +0200 Subject: [PATCH] check for empty string before calling strtoul() and check errno Note: since strtoul() has no real error return code (both 0 and ULONG_MAX may be returned on both success and failure), set errno=0 before calling strtoul(). --- swaybar/input.c | 5 +++-- swaynag/swaynag.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/swaybar/input.c b/swaybar/input.c index 8a83f38f..8b83eab4 100644 --- a/swaybar/input.c +++ b/swaybar/input.c @@ -70,10 +70,11 @@ void update_cursor(struct swaybar_seat *seat) { const char *cursor_theme = getenv("XCURSOR_THEME"); unsigned cursor_size = 24; const char *env_cursor_size = getenv("XCURSOR_SIZE"); - if (env_cursor_size) { + if (env_cursor_size && strlen(env_cursor_size) > 0) { + errno = 0; char *end; unsigned size = strtoul(env_cursor_size, &end, 10); - if (!*end) { + if (!*end && errno == 0) { cursor_size = size; } } diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 87199a74..caa10ccd 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -132,10 +132,11 @@ static void update_cursor(struct swaynag *swaynag) { const char *cursor_theme = getenv("XCURSOR_THEME"); unsigned cursor_size = 24; const char *env_cursor_size = getenv("XCURSOR_SIZE"); - if (env_cursor_size) { + if (env_cursor_size && strlen(env_cursor_size) > 0) { + errno = 0; char *end; unsigned size = strtoul(env_cursor_size, &end, 10); - if (!*end) { + if (!*end && errno == 0) { cursor_size = size; } }