mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 04:05:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: Fix dmabuf handle leaks

Browse source 
Close dmabuf handles manually when they're not going to
be passed into GStreamer FD memory, to avoid fd handle
leaks.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7240>
This commit is contained in:
Jan Schmidt 2024-07-25 22:44:51 +10:00 committed by GStreamer Marge Bot
parent f11735c97b
commit 1ebbcc31ef
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c
View file

@ -628,6 +628,11 @@ _va_create_surface_and_export_to_dmabuf (GstVaDisplay * display,
failed: failed:
{ {
/* Free DMAbufs on failure */
for (guint32 i = 0; i < desc.num_objects; i++) {
gint fd = desc.objects[i].fd;
close (fd);
}
va_destroy_surfaces (display, &surface, 1); va_destroy_surfaces (display, &surface, 1);
return FALSE; return FALSE;
} }
@ -660,6 +665,11 @@ gst_va_dmabuf_get_modifier_for_format (GstVaDisplay * display,
NULL, 0, &info, &surface, &desc)) NULL, 0, &info, &surface, &desc))
return DRM_FORMAT_MOD_INVALID; return DRM_FORMAT_MOD_INVALID;
/* Close the fds we won't be using */
for (guint32 i = 0; i < desc.num_objects; i++) {
gint fd = desc.objects[i].fd;
close (fd);
}
va_destroy_surfaces (display, &surface, 1); va_destroy_surfaces (display, &surface, 1);
return desc.objects[0].drm_format_modifier; return desc.objects[0].drm_format_modifier;