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

Merge pull request #3500 from progandy/validate_pixmaps

Browse source 
swaybar: fix crash with some tray icon pixmaps
This commit is contained in:
Drew DeVault 2019-01-23 09:21:08 -05:00 committed by GitHub
parent 1803e7748b dcabe0e6da
commit 8b056cfc82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
swaybar/tray/item.c
View file

@ -56,8 +56,8 @@ static int read_pixmap(sd_bus_message *msg, struct swaybar_sni *sni,
goto error; goto error;
} }
int size; int width, height;
ret = sd_bus_message_read(msg, "ii", NULL, &size); ret = sd_bus_message_read(msg, "ii", &width, &height);
if (ret < 0) { if (ret < 0) {
sway_log(SWAY_ERROR, "%s %s: %s", sni->watcher_id, prop, strerror(-ret)); sway_log(SWAY_ERROR, "%s %s: %s", sni->watcher_id, prop, strerror(-ret));
goto error; goto error;
@ -71,14 +71,25 @@ static int read_pixmap(sd_bus_message *msg, struct swaybar_sni *sni,
goto error; goto error;
} }
struct swaybar_pixmap *pixmap = if (height > 0 && width == height) {
malloc(sizeof(struct swaybar_pixmap) + npixels); sway_log(SWAY_DEBUG, "%s %s: found icon w:%d h:%d", sni->watcher_id, prop, width, height);
pixmap->size = size; struct swaybar_pixmap *pixmap =
memcpy(pixmap->pixels, pixels, npixels); malloc(sizeof(struct swaybar_pixmap) + npixels);
list_add(pixmaps, pixmap); pixmap->size = height;
memcpy(pixmap->pixels, pixels, npixels);
list_add(pixmaps, pixmap);
} else {
sway_log(SWAY_DEBUG, "%s %s: discard invalid icon w:%d h:%d", sni->watcher_id, prop, width, height);
}
sd_bus_message_exit_container(msg); sd_bus_message_exit_container(msg);
} }
if (pixmaps->length < 1) {
sway_log(SWAY_DEBUG, "%s %s no. of icons = 0", sni->watcher_id, prop);
goto error;
}
list_free_items_and_destroy(*dest); list_free_items_and_destroy(*dest);
*dest = pixmaps; *dest = pixmaps;
sway_log(SWAY_DEBUG, "%s %s no. of icons = %d", sni->watcher_id, prop, sway_log(SWAY_DEBUG, "%s %s no. of icons = %d", sni->watcher_id, prop,