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

Fix size_t temporary underflow in log_loaded_themes

Browse source 
`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
This commit is contained in:
emersion 2019-03-11 17:00:06 +01:00 committed by Brian Ashworth
parent 783b3d6b37
commit bcde298a71
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
swaybar/tray/icon.c
View file

@ -307,16 +307,16 @@ static void log_loaded_themes(list_t *themes) {
return; return;
} }
const char *sep = ", "; const char sep[] = ", ";
size_t sep_len = strlen(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) { for (int i = 0; i < themes->length; ++i) {
struct icon_theme *theme = themes->items[i]; struct icon_theme *theme = themes->items[i];
len += strlen(theme->name) + sep_len; len += strlen(theme->name) + sep_len;
} }
char *str = malloc(len); char *str = malloc(len + 1);
if (!str) { if (!str) {
return; return;
} }