From: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Date: Mon, 3 Nov 2014 17:46:57 +0000 (+0000)
Subject: pad: fail dropped queries
X-Git-Tag: 1.6.1~669
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7103ce4b8c1da7dcfbcf2ec83a42a376fb896e1;p=platform%2Fupstream%2Fgstreamer.git

pad: fail dropped queries

Previously, dropping a query from a pad probe would deem the
query succeeded, and the caller might then assume the query's
results are valid, and thus dereference an invalid object
such as a GstCaps.

We now assume dropped queries did not succeed. Dropped events
and buffers are still deemed a success.
---

diff --git a/gst/gstpad.c b/gst/gstpad.c
index e835e29..4c063fe 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -3643,11 +3643,8 @@ probe_stopped:
       GST_PAD_STREAM_UNLOCK (pad);
 
     /* if a probe dropped, we don't sent it further but assume that the probe
-     * answered the query and return TRUE */
-    if (ret == GST_FLOW_CUSTOM_SUCCESS)
-      res = TRUE;
-    else
-      res = FALSE;
+     * did not answer the query and return FALSE */
+    res = FALSE;
 
     return res;
   }
@@ -3760,11 +3757,8 @@ probe_stopped:
     GST_OBJECT_UNLOCK (pad);
 
     /* if a probe dropped, we don't sent it further but assume that the probe
-     * answered the query and return TRUE */
-    if (ret == GST_FLOW_CUSTOM_SUCCESS)
-      res = TRUE;
-    else
-      res = FALSE;
+     * did not answer the query and return FALSE */
+    res = FALSE;
 
     return res;
   }