diff --git a/ChangeLog b/ChangeLog index 145fba9efc..c656f0b0e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-06 Wim Taymans + + Patch by: Antoine Tremblay + + * gst/gstpad.c: (gst_pad_link_check_compatible_unlocked): + Original patch by : Simon Descaries + Fix small refount leak in caps compatibility check. + Fixes #551676. + 2008-10-06 Stefan Kost * docs/pwg/advanced-request.xml: diff --git a/common b/common index 1ff63d8f92..ea93f2ed58 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 1ff63d8f92c36bf207434436f4ce75f2a4ea11a4 +Subproject commit ea93f2ed580bcc19322e4c07f677eda980c821eb diff --git a/gst/gstpad.c b/gst/gstpad.c index b610ca7265..6a52cef0d9 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1679,8 +1679,13 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink) /* if we have caps on both pads we can check the intersection. If one * of the caps is NULL, we return TRUE. */ - if (srccaps == NULL || sinkcaps == NULL) + if (srccaps == NULL || sinkcaps == NULL) { + if (srccaps) + gst_caps_unref (srccaps); + if (sinkcaps) + gst_caps_unref (sinkcaps); goto done; + } icaps = gst_caps_intersect (srccaps, sinkcaps); gst_caps_unref (srccaps);