mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland/selection: introduce xwm_selection_transfer_init

Browse source 
Currently, all this does is initialize `wl_client_fd` to -1, so that
comparisons with 0 are meaningful.
This commit is contained in:
Tudor Brindus 2021-01-30 14:58:27 -05:00 • committed by Simon Ser
parent aa86a022fa
commit b3d782f818
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xwayland/selection/incoming.c
View file

@ -155,7 +155,7 @@ static void source_send(struct wlr_xwm_selection *selection,
// lose track of the current `transfer->wl_client_fd` and use-after-free
// during cleanup. This doesn't happen often, but bail now to avoid a
// compositor crash later.
if (transfer->wl_client_fd > 0) {
if (transfer->wl_client_fd >= 0) {
wlr_log(WLR_ERROR, "source_send fd %d, but %d already in progress", fd,
transfer->wl_client_fd);
if (transfer->wl_client_fd != fd) {
@ -404,7 +404,7 @@ void xwm_handle_selection_notify(struct wlr_xwm *xwm,
wlr_log(WLR_DEBUG, "denying write access to clipboard: "
"no xwayland surface focused");
// Would leak this transfer otherwise. Should never happen.
assert(selection->incoming.wl_client_fd <= 0);
assert(selection->incoming.wl_client_fd < 0);
return;
}