mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Don't leak othercaps in link function (fixes #167878)

Browse source 
Original commit message from CVS:
Don't leak othercaps in link function (fixes #167878)
This commit is contained in:
Tim-Philipp Müller 2005-02-19 20:01:36 +00:00
parent 4190810daf
commit 797a080e39
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-02-19 Martin Holters <martin.holters@gmx.de>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
* gst/audioconvert/bufferframesconvert.c:
(buffer_frames_convert_link):
Don't leak othercaps. (fixes #167878)
2005-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>> 2005-02-19 Arwed v. Merkatz <v.merkatz@gmx.net>>
* configure.ac: * configure.ac:

3
gst/audioconvert/bufferframesconvert.c
View file

@ -266,9 +266,9 @@ buffer_frames_convert_link (GstPad * pad, const GstCaps * caps)
gst_caps_set_simple (othercaps, "buffer-frames", GST_TYPE_INT_RANGE, 0, gst_caps_set_simple (othercaps, "buffer-frames", GST_TYPE_INT_RANGE, 0,
G_MAXINT, NULL); G_MAXINT, NULL);
ret = gst_pad_try_set_caps_nonfixed (otherpad, othercaps); ret = gst_pad_try_set_caps_nonfixed (otherpad, othercaps);
gst_caps_free (othercaps);
if (GST_PAD_LINK_FAILED (ret)) if (GST_PAD_LINK_FAILED (ret))
return ret; return ret;
gst_caps_free (othercaps);
othercaps = gst_caps_copy (gst_pad_get_negotiated_caps (otherpad)); othercaps = gst_caps_copy (gst_pad_get_negotiated_caps (otherpad));
/* it's ok, let's record our data */ /* it's ok, let's record our data */
@ -284,6 +284,7 @@ buffer_frames_convert_link (GstPad * pad, const GstCaps * caps)
gst_structure_get_int (sinkstructure, "channels", &numchannels); gst_structure_get_int (sinkstructure, "channels", &numchannels);
this->in_buffer_samples *= numchannels; this->in_buffer_samples *= numchannels;
this->out_buffer_samples *= numchannels; this->out_buffer_samples *= numchannels;
gst_caps_free (othercaps);
if (this->out_buffer_samples == 0) if (this->out_buffer_samples == 0)
this->passthrough = TRUE; this->passthrough = TRUE;