hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes segfault when no xcb_render_pictforminfo_t is available

Browse source
This commit is contained in:
emersion 2017-11-02 17:21:00 +01:00
parent bb76f52640
commit 900fb326f7
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwayland/xwm.c
View file

@ -1193,17 +1193,18 @@ static void xwm_get_render_format(struct wlr_xwm *xwm) {
xcb_render_query_pict_formats(xwm->xcb_conn); xcb_render_query_pict_formats(xwm->xcb_conn);
xcb_render_query_pict_formats_reply_t *reply = xcb_render_query_pict_formats_reply_t *reply =
xcb_render_query_pict_formats_reply(xwm->xcb_conn, cookie, NULL); xcb_render_query_pict_formats_reply(xwm->xcb_conn, cookie, NULL);
xcb_render_pictforminfo_t *formats = xcb_render_pictforminfo_iterator_t iter =
xcb_render_query_pict_formats_formats(reply); xcb_render_query_pict_formats_formats_iterator(reply);
int len = xcb_render_query_pict_formats_formats_length(reply);
xcb_render_pictforminfo_t *format = NULL; xcb_render_pictforminfo_t *format = NULL;
for (int i = 0; i < len; ++i) { while (iter.rem > 0) {
if (formats[i].depth == 32) { if (iter.data->depth == 32) {
format = &formats[i]; format = iter.data;
break; break;
} }
// TODO: segfaults when not found
xcb_render_pictforminfo_next(&iter);
} }
if (format == NULL) { if (format == NULL) {
wlr_log(L_DEBUG, "No 32 bit render format"); wlr_log(L_DEBUG, "No 32 bit render format");
return; return;