mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

ogg: check return values in gst_ogg_parse_new_stream

Browse source 
Return NULL in gst_ogg_parse_new_stream when either ogg_stream_pagein() or
gst_ogg_stream_setup_map() failed.

https://bugzilla.gnome.org/show_bug.cgi?id=769299
This commit is contained in:
Luis de Bethencourt 2016-08-01 16:00:29 +01:00
parent 5cab723651
commit 7ae577dc3a
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/ogg/gstoggparse.c
View file

@ -148,17 +148,19 @@ gst_ogg_parse_new_stream (GstOggParse * parser, ogg_page * page)
if (ogg_stream_init (&stream->stream, serialno) != 0) {
GST_ERROR ("Could not initialize ogg_stream struct for serial %08x.",
serialno);
g_slice_free (GstOggStream, stream);
return NULL;
goto failure;
}
/* FIXME check return */
ogg_stream_pagein (&stream->stream, page);
if (ogg_stream_pagein (&stream->stream, page) != 0)
goto failure;
/* FIXME check return */
ret = ogg_stream_packetout (&stream->stream, &packet);
if (ret == 1) {
gst_ogg_stream_setup_map (stream, &packet);
if (!gst_ogg_stream_setup_map (stream, &packet)) {
GST_ERROR ("Could not setup map for ogg packet.");
goto failure;
}
if (stream->is_video) {
parser->video_stream = stream;
}
@ -167,6 +169,10 @@ gst_ogg_parse_new_stream (GstOggParse * parser, ogg_page * page)
parser->oggstreams = g_slist_append (parser->oggstreams, stream);
return stream;
failure:
free_stream (stream);
return NULL;
}
static GstOggStream *
@ -478,6 +484,10 @@ gst_ogg_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
}
stream = gst_ogg_parse_new_stream (ogg, &page);
if (!stream) {
GST_LOG_OBJECT (ogg, "Incorrect page");
goto failure;
}
ogg->last_page_not_bos = FALSE;