hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend/drm: fix libliftoff_plane double-free

Browse source 
Destroying the liftoff_device invalidates all of the liftoff_planes.
Destroy the liftoff_planes before the liftoff_device to fix this.
This commit is contained in:
Simon Ser 2023-06-20 23:05:25 +02:00 committed by Alexander Orzechowski
parent 8714657d7b
commit fffa1908af
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/drm/drm.c
View file

@ -323,9 +323,6 @@ void finish_drm_resources(struct wlr_drm_backend *drm) {
for (size_t i = 0; i < drm->num_planes; ++i) { for (size_t i = 0; i < drm->num_planes; ++i) {
struct wlr_drm_plane *plane = &drm->planes[i]; struct wlr_drm_plane *plane = &drm->planes[i];
wlr_drm_format_set_finish(&plane->formats); wlr_drm_format_set_finish(&plane->formats);
#if HAVE_LIBLIFTOFF
liftoff_plane_destroy(plane->liftoff);
#endif
} }
free(drm->planes); free(drm->planes);

5
backend/drm/libliftoff.c
View file

@ -109,6 +109,11 @@ static void finish(struct wlr_drm_backend *drm) {
liftoff_output_destroy(crtc->liftoff); liftoff_output_destroy(crtc->liftoff);
} }
for (size_t i = 0; i < drm->num_planes; i++) {
struct wlr_drm_plane *plane = &drm->planes[i];
liftoff_plane_destroy(plane->liftoff);
}
liftoff_device_destroy(drm->liftoff); liftoff_device_destroy(drm->liftoff);
} }