mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-27 18:50:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

ac3parse, dcaparse: check buffer size before trimming

Browse source 
and unref old buffer as soon as possible.
This commit is contained in:
Tim-Philipp Müller 2013-05-04 09:48:02 +01:00
parent 3462282b83
commit 68ac392e8f
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/audioparsers/gstac3parse.c
View file

@ -692,14 +692,21 @@ cleanup:
static GstFlowReturn
gst_ac3_parse_chain_priv (GstPad * pad, GstObject * parent, GstBuffer * buffer)
{
GstBuffer *newbuf;
GstFlowReturn ret;
GstAc3Parse *ac3parse = GST_AC3_PARSE (parent);
GstFlowReturn ret;
GstBuffer *newbuf;
gsize size;
size = gst_buffer_get_size (buffer);
if (size >= 2) {
newbuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL, 2, size - 2);
gst_buffer_unref (buffer);
ret = ac3parse->baseparse_chainfunc (pad, parent, newbuf);
} else {
gst_buffer_unref (buffer);
ret = GST_FLOW_OK;
}
newbuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL,
2, gst_buffer_get_size (buffer) - 2);
ret = ac3parse->baseparse_chainfunc (pad, parent, newbuf);
gst_buffer_unref (buffer);
return ret;
}

21
gst/audioparsers/gstdcaparse.c
View file

@ -454,16 +454,23 @@ cleanup:
* */
static GstFlowReturn
gst_dca_parse_chain_priv (GstPad * pad, GstObject *parent, GstBuffer * buffer)
gst_dca_parse_chain_priv (GstPad * pad, GstObject * parent, GstBuffer * buffer)
{
GstBuffer *newbuf;
GstFlowReturn ret;
GstDcaParse *dcaparse = GST_DCA_PARSE (parent);
GstFlowReturn ret;
GstBuffer *newbuf;
gsize size;
size = gst_buffer_get_size (buffer);
if (size >= 2) {
newbuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL, 2, size - 2);
gst_buffer_unref (buffer);
ret = dcaparse->baseparse_chainfunc (pad, parent, newbuf);
} else {
gst_buffer_unref (buffer);
ret = GST_FLOW_OK;
}
newbuf = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL,
2, gst_buffer_get_size (buffer) - 2);
ret = dcaparse->baseparse_chainfunc (pad, parent, newbuf);
gst_buffer_unref (buffer);
return ret;
}