mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-01 12:02:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: Check data NULL-ness when probes are stopped

Browse source 
We were correctly handling this for buffers, but not events and queries.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7619>
This commit is contained in:
Arun Raghavan 2024-09-10 16:03:05 -04:00 committed by GStreamer Marge Bot
parent 1c892fd968
commit adde0d9757
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gstreamer/gst/gstpad.c
View file

@ -4562,7 +4562,7 @@ probe_handled:
probe_stopped: probe_stopped:
{ {
/* We unref the buffer, except if the probe handled it (CUSTOM_SUCCESS_1) */ /* We unref the buffer, except if the probe handled it (CUSTOM_SUCCESS_1) */
if (!handled) if (data && !handled)
gst_mini_object_unref (GST_MINI_OBJECT_CAST (data)); gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
switch (ret) { switch (ret) {
@ -5630,7 +5630,7 @@ inactive:
probe_stopped: probe_stopped:
{ {
GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS); GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PENDING_EVENTS);
if (ret != GST_FLOW_CUSTOM_SUCCESS_1) if (event && ret != GST_FLOW_CUSTOM_SUCCESS_1)
gst_event_unref (event); gst_event_unref (event);
switch (ret) { switch (ret) {
@ -6039,7 +6039,7 @@ probe_stopped:
if (need_unlock) if (need_unlock)
GST_PAD_STREAM_UNLOCK (pad); GST_PAD_STREAM_UNLOCK (pad);
/* Only unref if unhandled */ /* Only unref if unhandled */
if (ret != GST_FLOW_CUSTOM_SUCCESS_1) if (event && ret != GST_FLOW_CUSTOM_SUCCESS_1)
gst_event_unref (event); gst_event_unref (event);
switch (ret) { switch (ret) {