Merge branch 'bilelmoussaoui/close-fd' into 'main'

paintable: Properly close DMABuf FD

See merge request chergert/libmks!20
This commit is contained in:
Christian Hergert 2023-05-24 23:02:27 +00:00
commit 00099bb4a5

View File

@ -374,6 +374,9 @@ mks_paintable_listener_scanout_dmabuf (MksPaintable *self,
scanout_data->stride = stride; scanout_data->stride = stride;
scanout_data->fourcc = fourcc; scanout_data->fourcc = fourcc;
scanout_data->modifier = modifier; scanout_data->modifier = modifier;
if (self->scanout_data)
g_clear_fd (&self->scanout_data->dmabuf_fd, NULL);
g_clear_pointer (&self->scanout_data, g_free); g_clear_pointer (&self->scanout_data, g_free);
self->scanout_data = scanout_data; self->scanout_data = scanout_data;