mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clipboard: Fix fd leak

Browse Source 
We never closed the reading end of the pipe after copying data to the
clipboard.
This commit is contained in:
Kristian Høgsberg
2013-07-25 16:21:41 -07:00
parent 5e76a49d9c
commit 46118f8197
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clipboard.c
+8 -2
View File
@@ -38,6 +38,7 @@ struct clipboard_source {
struct wl_event_source *event_source; struct wl_event_source *event_source;
uint32_t serial; uint32_t serial;
int refcount; int refcount;
int fd;
}; };
struct clipboard { struct clipboard {
@@ -58,8 +59,10 @@ clipboard_source_unref(struct clipboard_source *source)
if (source->refcount > 0) if (source->refcount > 0)
return; return;
if (source->event_source) if (source->event_source) {
wl_event_source_remove(source->event_source); wl_event_source_remove(source->event_source);
close(source->fd);
}
wl_signal_emit(&source->base.destroy_signal, wl_signal_emit(&source->base.destroy_signal,
&source->base); &source->base);
s = source->base.mime_types.data; s = source->base.mime_types.data;
@@ -87,6 +90,7 @@ clipboard_source_data(int fd, uint32_t mask, void *data)
len = read(fd, p, size); len = read(fd, p, size);
if (len == 0) { if (len == 0) {
wl_event_source_remove(source->event_source); wl_event_source_remove(source->event_source);
close(fd);
source->event_source = NULL; source->event_source = NULL;
} else if (len < 0) { } else if (len < 0) {
clipboard_source_unref(source); clipboard_source_unref(source);
@@ -256,9 +260,11 @@ clipboard_set_selection(struct wl_listener *listener, void *data)
clipboard->source = clipboard->source =
clipboard_source_create(clipboard, mime_types[0], clipboard_source_create(clipboard, mime_types[0],
seat->selection_serial, p[0]); seat->selection_serial, p[0]);
if (clipboard->source == NULL) if (clipboard->source == NULL) {
close(p[0]);
return; return;
} }
}
static void static void
clipboard_destroy(struct wl_listener *listener, void *data) clipboard_destroy(struct wl_listener *listener, void *data)