encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't double-free clipboard sources if ours gets cancelled. 

Fixes #6007.
This commit is contained in:
Ryan C. Gordon 2022-08-05 21:23:39 -04:00
parent 3da131c1c6
commit a6179e85c0
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/wayland/SDL_waylanddatamanager.c
View File

@ -322,6 +322,10 @@ void
Wayland_data_source_destroy(SDL_WaylandDataSource *source) Wayland_data_source_destroy(SDL_WaylandDataSource *source)
{ {
if (source != NULL) { if (source != NULL) {
SDL_WaylandDataDevice *data_device = (SDL_WaylandDataDevice *) source->data_device;
if (data_device && (data_device->selection_source == source)) {
data_device->selection_source = NULL;
}
wl_data_source_destroy(source->source); wl_data_source_destroy(source->source);
mime_data_list_free(&source->mimes); mime_data_list_free(&source->mimes);
SDL_free(source); SDL_free(source);
@ -449,6 +453,7 @@ Wayland_data_device_set_selection(SDL_WaylandDataDevice *data_device,
Wayland_data_source_destroy(data_device->selection_source); Wayland_data_source_destroy(data_device->selection_source);
} }
data_device->selection_source = source; data_device->selection_source = source;
source->data_device = data_device;
} }
} }

1
src/video/wayland/SDL_waylanddatamanager.h
View File

@ -40,6 +40,7 @@ typedef struct {
typedef struct { typedef struct {
struct wl_data_source *source; struct wl_data_source *source;
struct wl_list mimes; struct wl_list mimes;
void *data_device;
} SDL_WaylandDataSource; } SDL_WaylandDataSource;
typedef struct { typedef struct {