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)
This commit is contained in:
Thijs Vermeir 2008-02-01 11:27:32 +00:00
parent ba976a1864
commit c595a566d9
2 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2008-02-01 Thijs Vermeir <thijsvermeir@gmail.com>
* gst/gstutils.c:
Check if caps are not NULL (fix bug #510194)
2008-02-01 Wim Taymans <wim.taymans@collabora.co.uk> 2008-02-01 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesink.c: (gst_base_sink_loop), * libs/gst/base/gstbasesink.c: (gst_base_sink_loop),

View file

@ -1551,7 +1551,8 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname,
gst_element_get_request_pad (src, srctempl->name_template); gst_element_get_request_pad (src, srctempl->name_template);
destpad = destpad =
gst_element_get_request_pad (dest, desttempl->name_template); 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, GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS,
"linked pad %s:%s to pad %s:%s", "linked pad %s:%s to pad %s:%s",
GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (destpad)); 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; return TRUE;
} }
/* it failed, so we release the request pads */ /* it failed, so we release the request pads */
gst_element_release_request_pad (src, srcpad); if (srcpad)
gst_element_release_request_pad (dest, destpad); gst_element_release_request_pad (src, srcpad);
if (destpad)
gst_element_release_request_pad (dest, destpad);
} }
} }
} }