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

vorbisparse: error out when headers are missing

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=791606
This commit is contained in:
Tim-Philipp Müller 2018-02-14 00:22:38 +00:00
parent 54655196e7
commit 466b868459
1 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ext/vorbis/gstvorbisparse.c
View file

@ -178,7 +178,21 @@ vorbis_parse_drain_event_queue (GstVorbisParse * parse)
} }
} }
static void static gboolean
vorbis_parse_have_header_packet (GstVorbisParse * parse, guint8 hdr_id)
{
guint8 hdr;
GList *l;
for (l = parse->streamheader; l != NULL; l = l->next) {
if (gst_buffer_extract (l->data, 0, &hdr, 1) == 1 && hdr == hdr_id)
return TRUE;
}
return FALSE;
}
static gboolean
vorbis_parse_push_headers (GstVorbisParse * parse) vorbis_parse_push_headers (GstVorbisParse * parse)
{ {
/* mark and put on caps */ /* mark and put on caps */
@ -186,6 +200,20 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
GstBuffer *outbuf, *outbuf1, *outbuf2, *outbuf3; GstBuffer *outbuf, *outbuf1, *outbuf2, *outbuf3;
ogg_packet packet; ogg_packet packet;
GstMapInfo map; GstMapInfo map;
const gchar *hdr_name;
/* Check we have enough header packets, and the right ones */
hdr_name = "identification";
if (!vorbis_parse_have_header_packet (parse, 1))
goto missing_header;
hdr_name = "comment";
if (!vorbis_parse_have_header_packet (parse, 3))
goto missing_header;
hdr_name = "setup";
if (!vorbis_parse_have_header_packet (parse, 5))
goto missing_header;
outbuf = GST_BUFFER_CAST (parse->streamheader->data); outbuf = GST_BUFFER_CAST (parse->streamheader->data);
gst_buffer_map (outbuf, &map, GST_MAP_READ); gst_buffer_map (outbuf, &map, GST_MAP_READ);
@ -244,6 +272,15 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
g_list_free (parse->streamheader); g_list_free (parse->streamheader);
parse->streamheader = NULL; parse->streamheader = NULL;
return TRUE;
/* ERRORS */
missing_header:
{
GST_ELEMENT_ERROR (parse, STREAM, DECODE, (NULL),
("Vorbis stream is missing %s header", hdr_name));
return FALSE;
}
} }
static void static void
@ -413,12 +450,17 @@ vorbis_parse_parse_packet (GstVorbisParse * parse, GstBuffer * buf)
} else { } else {
/* data packet, push the headers we collected before */ /* data packet, push the headers we collected before */
if (!parse->streamheader_sent) { if (!parse->streamheader_sent) {
vorbis_parse_push_headers (parse); if (!vorbis_parse_push_headers (parse)) {
ret = GST_FLOW_ERROR;
goto out;
}
parse->streamheader_sent = TRUE; parse->streamheader_sent = TRUE;
} }
ret = vorbis_parse_queue_buffer (parse, buf); ret = vorbis_parse_queue_buffer (parse, buf);
} }
out:
return ret; return ret;
} }