mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-09 16:02:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiodecoder: Plug caps leaks

Browse source 
We were returning in various places without unreffing the caps, and
we were also leaking (overwriting) the caps we got from _get_current_caps()

Spotted by Haakon Sporsheim in #gstreamer
This commit is contained in:
Edward Hervey 2014-04-25 11:30:37 +02:00
parent 2ed8f2e503
commit 74eb5fa995
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -1833,11 +1833,13 @@ gst_audio_decoder_negotiate_default_caps (GstAudioDecoder * dec)
caps = gst_pad_get_current_caps (dec->srcpad); caps = gst_pad_get_current_caps (dec->srcpad);
if (caps && !gst_audio_info_from_caps (&dec->priv->ctx.info, caps)) if (caps && !gst_audio_info_from_caps (&dec->priv->ctx.info, caps))
return FALSE; goto caps_error;
if (caps)
gst_caps_unref (caps);
caps = gst_pad_get_allowed_caps (dec->srcpad); caps = gst_pad_get_allowed_caps (dec->srcpad);
if (!caps || gst_caps_is_empty (caps) || gst_caps_is_any (caps)) if (!caps || gst_caps_is_empty (caps) || gst_caps_is_any (caps))
return FALSE; goto caps_error;
/* before fixating, try to use whatever upstream provided */ /* before fixating, try to use whatever upstream provided */
caps_size = gst_caps_get_size (caps); caps_size = gst_caps_get_size (caps);
@ -1896,7 +1898,7 @@ gst_audio_decoder_negotiate_default_caps (GstAudioDecoder * dec)
} }
if (!caps || !gst_audio_info_from_caps (&dec->priv->ctx.info, caps)) if (!caps || !gst_audio_info_from_caps (&dec->priv->ctx.info, caps))
return FALSE; goto caps_error;
GST_INFO_OBJECT (dec, GST_INFO_OBJECT (dec,
"Chose default caps %" GST_PTR_FORMAT " for initial gap", caps); "Chose default caps %" GST_PTR_FORMAT " for initial gap", caps);
@ -1909,6 +1911,13 @@ gst_audio_decoder_negotiate_default_caps (GstAudioDecoder * dec)
} }
return TRUE; return TRUE;
caps_error:
{
if (caps)
gst_caps_unref (caps);
return FALSE;
}
} }
static gboolean static gboolean