aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-03-11 17:00:06 +0100
committerBrian Ashworth <bosrsf04@gmail.com>2019-03-11 12:12:46 -0400
commitbcde298a719f60b9913133dbd2a169dedbc8dd7d (patch)
tree391fd7e832652c5eaae6df67737a41ecc405b3d0
parent783b3d6b378db0bdf2a10bfa8a6787bd4b152a5a (diff)
downloadsway-bcde298a719f60b9913133dbd2a169dedbc8dd7d.zip
sway-bcde298a719f60b9913133dbd2a169dedbc8dd7d.tar.gz
sway-bcde298a719f60b9913133dbd2a169dedbc8dd7d.tar.bz2
Fix size_t temporary underflow in log_loaded_themes
`len` will underflow but will overflow right after, so it's not as bad as it may appear. Still better not to under/overflow at all. Fixes https://github.com/swaywm/sway/issues/3862
-rw-r--r--swaybar/tray/icon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c
index c7ce20b..2276e36 100644
--- a/swaybar/tray/icon.c
+++ b/swaybar/tray/icon.c
@@ -307,16 +307,16 @@ static void log_loaded_themes(list_t *themes) {
return;
}
- const char *sep = ", ";
+ const char sep[] = ", ";
size_t sep_len = strlen(sep);
- size_t len = 1 - sep_len;
+ size_t len = 0;
for (int i = 0; i < themes->length; ++i) {
struct icon_theme *theme = themes->items[i];
len += strlen(theme->name) + sep_len;
}
- char *str = malloc(len);
+ char *str = malloc(len + 1);
if (!str) {
return;
}