callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Ensure we close the fd on all error paths in data_source.send

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=751414
This commit is contained in:
Carlos Garnacho
2015-06-24 21:55:12 +02:00
parent 3bd7b2a6fb
commit fb266a8876
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/wayland/gdkselection-wayland.c
View File

@ -643,7 +643,10 @@ data_source_send (void *data,
G_STRFUNC, source, mime_type, fd); G_STRFUNC, source, mime_type, fd);
if (!mime_type) if (!mime_type)
return; {
close (fd);
return;
}
context = gdk_wayland_drag_context_lookup_by_data_source (source); context = gdk_wayland_drag_context_lookup_by_data_source (source);
@ -652,7 +655,10 @@ data_source_send (void *data,
else if (source == wayland_selection->clipboard_source) else if (source == wayland_selection->clipboard_source)
window = wayland_selection->clipboard_owner; window = wayland_selection->clipboard_owner;
else else
return; {
close (fd);
return;
}
if (!gdk_wayland_selection_request_target (wayland_selection, window, if (!gdk_wayland_selection_request_target (wayland_selection, window,
gdk_atom_intern (mime_type, FALSE), gdk_atom_intern (mime_type, FALSE),