From d8900170213fd1a5fee770ca715b25c2e4df4e83 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 21 Nov 2011 17:43:51 +0100 Subject: [PATCH] pad: fix locking order error --- gst/gstpad.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index 79211d9..4c5b2aa 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -395,6 +395,7 @@ replace_event (GstPad * srcpad, GstPad * sinkpad, guint idx) } +/* srcpad and sinkpad LOCK must be taken */ static void prepare_event_update (GstPad * srcpad, GstPad * sinkpad) { @@ -1598,11 +1599,13 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink, /* Doing the expensive caps checking takes priority over only checking the template caps */ if (flags & GST_PAD_LINK_CHECK_CAPS) { + GST_OBJECT_UNLOCK (sink); GST_OBJECT_UNLOCK (src); + srccaps = gst_pad_query_caps (src, NULL); - GST_OBJECT_LOCK (src); - GST_OBJECT_UNLOCK (sink); sinkcaps = gst_pad_query_caps (sink, NULL); + + GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (sink); } else { /* If one of the two pads doesn't have a template, consider the intersection -- 2.7.4