mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbisdec: detect and report errors better

Browse source 
Check the return values of a couple more libvorbis functions and post an error
when something is wrong instead of continuing and crashing.
This commit is contained in:
Wim Taymans 2009-05-22 17:41:50 +02:00 committed by Wim Taymans
parent 45298860fc
commit d1c73bd00f
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/vorbis/vorbisdec.c
View file

@ -761,11 +761,16 @@ static GstFlowReturn
vorbis_handle_type_packet (GstVorbisDec * vd) vorbis_handle_type_packet (GstVorbisDec * vd)
{ {
GList *walk; GList *walk;
gint res;
g_assert (vd->initialized == FALSE); g_assert (vd->initialized == FALSE);
vorbis_synthesis_init (&vd->vd, &vd->vi); if (G_UNLIKELY ((res = vorbis_synthesis_init (&vd->vd, &vd->vi))))
vorbis_block_init (&vd->vd, &vd->vb); goto synthesis_init_error;
if (G_UNLIKELY ((res = vorbis_block_init (&vd->vd, &vd->vb))))
goto block_init_error;
vd->initialized = TRUE; vd->initialized = TRUE;
if (vd->pendingevents) { if (vd->pendingevents) {
@ -780,21 +785,35 @@ vorbis_handle_type_packet (GstVorbisDec * vd)
gst_pad_push_event (vd->srcpad, gst_event_new_tag (vd->taglist)); gst_pad_push_event (vd->srcpad, gst_event_new_tag (vd->taglist));
vd->taglist = NULL; vd->taglist = NULL;
} }
return GST_FLOW_OK; return GST_FLOW_OK;
/* ERRORS */
synthesis_init_error:
{
GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE,
(NULL), ("couldn't initialize synthesis (%d)", res));
return GST_FLOW_ERROR;
}
block_init_error:
{
GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE,
(NULL), ("couldn't initialize block (%d)", res));
return GST_FLOW_ERROR;
}
} }
static GstFlowReturn static GstFlowReturn
vorbis_handle_header_packet (GstVorbisDec * vd, ogg_packet * packet) vorbis_handle_header_packet (GstVorbisDec * vd, ogg_packet * packet)
{ {
GstFlowReturn res; GstFlowReturn res;
gint ret;
GST_DEBUG_OBJECT (vd, "parsing header packet"); GST_DEBUG_OBJECT (vd, "parsing header packet");
/* Packetno = 0 if the first byte is exactly 0x01 */ /* Packetno = 0 if the first byte is exactly 0x01 */
packet->b_o_s = (packet->packet[0] == 0x1) ? 1 : 0; packet->b_o_s = (packet->packet[0] == 0x1) ? 1 : 0;
if (vorbis_synthesis_headerin (&vd->vi, &vd->vc, packet)) if ((ret = vorbis_synthesis_headerin (&vd->vi, &vd->vc, packet)))
goto header_read_error; goto header_read_error;
switch (packet->packet[0]) { switch (packet->packet[0]) {
@ -819,7 +838,7 @@ vorbis_handle_header_packet (GstVorbisDec * vd, ogg_packet * packet)
header_read_error: header_read_error:
{ {
GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE,
(NULL), ("couldn't read header packet")); (NULL), ("couldn't read header packet (%d)", ret));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
} }