vulkanoverlaycompositor: don't do a potential use after free
authorMatthew Waters <matthew@centricular.com>
Fri, 10 Mar 2023 05:47:17 +0000 (16:47 +1100)
committerTim-Philipp Müller <tim@centricular.com>
Fri, 10 Mar 2023 13:02:44 +0000 (13:02 +0000)
Removing a meta from a buffer means one doesn't have access to it
anymore.  Instead use the already reffed composition directly.

Fixes a use-after-free in the following pipeline:

... ! vulkanupload ! timeoverlay ! vulkanoverlaycompositor ! ...

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4147>

subprojects/gst-plugins-bad/ext/vulkan/vkoverlaycompositor.c

index dc405df..5908a57 100644 (file)
@@ -729,6 +729,7 @@ gst_vulkan_overlay_compositor_transform_ip (GstBaseTransform * bt,
 
   comp = gst_video_overlay_composition_ref (ometa->overlay);
   gst_buffer_remove_meta (buffer, (GstMeta *) ometa);
+  ometa = NULL;
 
   n = gst_video_overlay_composition_n_rectangles (comp);
   if (n == 0) {
@@ -765,7 +766,7 @@ gst_vulkan_overlay_compositor_transform_ip (GstBaseTransform * bt,
     struct vk_overlay *over =
         &g_array_index (vk_overlay->overlays, struct vk_overlay, i);
 
-    if (!overlay_in_rectangles (over, ometa->overlay)) {
+    if (!overlay_in_rectangles (over, comp)) {
       g_array_remove_index (vk_overlay->overlays, i);
       continue;
     }