blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg-foreign: Make imported object inert when exported is destroyed 

Fixes a double-free experienced with Firefox and
xdg-desktop-portal-gtk.
This commit is contained in:
Tadeo Kondrak 2021-02-07 21:42:52 -07:00 committed by Simon Ser
parent d595a4ebe3
commit 99ef23b62c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/wlr_xdg_foreign_v1.c
View File

@ -159,6 +159,7 @@ static void finish_imported(struct wlr_xdg_imported_v1 *imported) {
wl_list_remove(&imported->link); wl_list_remove(&imported->link);
wl_list_init(&imported->link); wl_list_init(&imported->link);
wl_resource_set_user_data(imported->resource, NULL);
free(imported); free(imported);
} }
@ -167,6 +168,7 @@ static void finish_exported(struct wlr_xdg_exported_v1 *exported) {
wl_list_remove(&exported->xdg_surface_destroy.link); wl_list_remove(&exported->xdg_surface_destroy.link);
wl_list_remove(&exported->link); wl_list_remove(&exported->link);
wl_resource_set_user_data(exported->resource, NULL);
free(exported); free(exported);
} }
@ -185,7 +187,6 @@ static void handle_xdg_surface_destroy(
struct wlr_xdg_exported_v1 *exported = struct wlr_xdg_exported_v1 *exported =
wl_container_of(listener, exported, xdg_surface_destroy); wl_container_of(listener, exported, xdg_surface_destroy);
wl_resource_set_user_data(exported->resource, NULL);
finish_exported(exported); finish_exported(exported);
} }

3
types/wlr_xdg_foreign_v2.c
View File

@ -159,6 +159,7 @@ static void finish_imported(struct wlr_xdg_imported_v2 *imported) {
wl_list_remove(&imported->link); wl_list_remove(&imported->link);
wl_list_init(&imported->link); wl_list_init(&imported->link);
wl_resource_set_user_data(imported->resource, NULL);
free(imported); free(imported);
} }
@ -167,6 +168,7 @@ static void finish_exported(struct wlr_xdg_exported_v2 *exported) {
wl_list_remove(&exported->xdg_surface_destroy.link); wl_list_remove(&exported->xdg_surface_destroy.link);
wl_list_remove(&exported->link); wl_list_remove(&exported->link);
wl_resource_set_user_data(exported->resource, NULL);
free(exported); free(exported);
} }
@ -185,7 +187,6 @@ static void handle_xdg_surface_destroy(
struct wlr_xdg_exported_v2 *exported = struct wlr_xdg_exported_v2 *exported =
wl_container_of(listener, exported, xdg_surface_destroy); wl_container_of(listener, exported, xdg_surface_destroy);
wl_resource_set_user_data(exported->resource, NULL);
finish_exported(exported); finish_exported(exported);
} }