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

oggdemux: handle corrupt indexes

Browse source 
Make sure we handle and receover from corrupt indexes.
This commit is contained in:
Wim Taymans 2010-05-04 17:38:50 +02:00
parent e84b3c838c
commit 7b3f9aa504
1 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ext/ogg/gstoggstream.c
View file

@ -836,39 +836,50 @@ gst_ogg_map_add_fisbone (GstOggStream * pad,
return TRUE; return TRUE;
} }
static guint64 static gboolean
read_vlc (const guint8 ** data, guint * size) read_vlc (const guint8 ** data, guint * size, guint64 * result)
{ {
gint shift = 0; gint shift = 0;
guint64 result = 0;
gint64 byte; gint64 byte;
*result = 0;
do { do {
if (G_UNLIKELY (*size < 1))
return FALSE;
byte = **data; byte = **data;
result |= ((byte & 0x7f) << shift); *result |= ((byte & 0x7f) << shift);
shift += 7; shift += 7;
(*data)++; (*data)++;
(*size)--;
} while ((byte & 0x80) != 0x80); } while ((byte & 0x80) != 0x80);
return result; return TRUE;
} }
gboolean gboolean
gst_ogg_map_add_index (GstOggStream * pad, const guint8 * data, guint size) gst_ogg_map_add_index (GstOggStream * pad, const guint8 * data, guint size)
{ {
guint64 n_keypoints; guint64 i, n_keypoints, isize;
guint i;
guint64 offset, timestamp; guint64 offset, timestamp;
guint64 offset_d, timestamp_d;
/* skip "index\0" + serialno */
data += 6 + 4;
size -= 6 + 4;
if (pad->index) { if (pad->index) {
GST_DEBUG ("already have index, ignoring second one"); GST_DEBUG ("already have index, ignoring second one");
return TRUE; return TRUE;
} }
if (size < 26) {
GST_WARNING ("small index packet of size %u, ignoring", size);
return FALSE;
}
/* skip "index\0" + serialno */
data += 6 + 4;
size -= 6 + 4;
n_keypoints = GST_READ_UINT64_LE (data); n_keypoints = GST_READ_UINT64_LE (data);
pad->kp_denom = GST_READ_UINT64_LE (data + 8); pad->kp_denom = GST_READ_UINT64_LE (data + 8);
@ -885,21 +896,32 @@ gst_ogg_map_add_index (GstOggStream * pad, const guint8 * data, guint size)
if (!pad->index) if (!pad->index)
return FALSE; return FALSE;
pad->n_index = n_keypoints; isize = 0;
offset = 0; offset = 0;
timestamp = 0; timestamp = 0;
for (i = 0; i < n_keypoints; i++) { for (i = 0; i < n_keypoints; i++) {
offset += read_vlc (&data, &size); /* read deltas */
timestamp += read_vlc (&data, &size); if (!read_vlc (&data, &size, &offset_d))
break;
if (!read_vlc (&data, &size, &timestamp_d))
break;
offset += offset_d;
timestamp += timestamp_d;
pad->index[i].offset = offset; pad->index[i].offset = offset;
pad->index[i].timestamp = timestamp; pad->index[i].timestamp = timestamp;
isize++;
GST_INFO ("offset %" G_GUINT64_FORMAT " time %" G_GUINT64_FORMAT, offset, GST_INFO ("offset %" G_GUINT64_FORMAT " time %" G_GUINT64_FORMAT, offset,
timestamp); timestamp);
} }
if (isize != n_keypoints) {
GST_WARNING ("truncated index, expected %" G_GUINT64_FORMAT ", found %"
G_GUINT64_FORMAT, n_keypoints, isize);
}
pad->n_index = isize;
return TRUE; return TRUE;
} }
@ -920,6 +942,7 @@ gst_ogg_map_search_index (GstOggStream * pad, gboolean before,
GST_INFO ("timestamp %" G_GUINT64_FORMAT, ts); GST_INFO ("timestamp %" G_GUINT64_FORMAT, ts);
best = -1; best = -1;
/* FIXME, do binary search */
for (i = 0; i < n_index; i++) { for (i = 0; i < n_index; i++) {
if (pad->index[i].timestamp <= ts) if (pad->index[i].timestamp <= ts)
best = i; best = i;