From 127256b59ad90e147314e6e83923824f6ff67d26 Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Wed, 30 Jan 2008 12:55:42 +0000 Subject: [PATCH] gst/gstutils.c: Check if caps are not NULL (fix bug #510194) Original commit message from CVS: * gst/gstutils.c: Check if caps are not NULL (fix bug #510194) --- ChangeLog | 5 +++++ gst/gstutils.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 170197b..98190f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-30 Thijs Vermeir + + * gst/gstutils.c: + Check if caps are not NULL (fix bug #510194) + 2008-01-30 Jan Schmidt * gst/gstutils.c: diff --git a/gst/gstutils.c b/gst/gstutils.c index 7a1dacf..583e8ca 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -1551,7 +1551,8 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname, gst_element_get_request_pad (src, srctempl->name_template); destpad = gst_element_get_request_pad (dest, desttempl->name_template); - if (pad_link_maybe_ghosting (srcpad, destpad)) { + if (srcpad && destpad + && pad_link_maybe_ghosting (srcpad, destpad)) { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "linked pad %s:%s to pad %s:%s", GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (destpad)); @@ -1560,8 +1561,10 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname, return TRUE; } /* it failed, so we release the request pads */ - gst_element_release_request_pad (src, srcpad); - gst_element_release_request_pad (dest, destpad); + if (srcpad) + gst_element_release_request_pad (src, srcpad); + if (destpad) + gst_element_release_request_pad (dest, destpad); } } } -- 2.7.4