mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 06:35:58 +01:00
Fix use-after-free when destroying an offer
This commit is contained in:
parent
b20aed66d6
commit
720c1154dc
2 changed files with 3 additions and 5 deletions
|
@ -173,6 +173,8 @@ static void data_offer_resource_destroy(struct wl_resource *resource) {
|
|||
goto out;
|
||||
}
|
||||
|
||||
offer->source->offer = NULL;
|
||||
|
||||
// If the drag destination has version < 3, wl_data_offer.finish
|
||||
// won't be called, so do this here as a safety net, because
|
||||
// we still want the version >= 3 drag source to be happy.
|
||||
|
@ -183,7 +185,6 @@ static void data_offer_resource_destroy(struct wl_resource *resource) {
|
|||
offer->source->cancel(offer->source);
|
||||
}
|
||||
|
||||
offer->source->offer = NULL;
|
||||
out:
|
||||
free(offer);
|
||||
}
|
||||
|
|
|
@ -44,11 +44,8 @@ static void offer_resource_handle_destroy(struct wl_resource *resource) {
|
|||
goto out;
|
||||
}
|
||||
|
||||
if (offer->source->cancel) {
|
||||
offer->source->cancel(offer->source);
|
||||
}
|
||||
|
||||
offer->source->offer = NULL;
|
||||
|
||||
out:
|
||||
free(offer);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue