Skip to content
Snippets Groups Projects
Commit 9e1c55cf authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

oggdec: check stream index before using it in ogg_get_length()


Fixes crash based on a uninitialized array index read.
If the read does not crash then out of array writes based
on the same index might have been triggered afterwards.

Found-by: default avatar <inferno@chromium.org>
Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 74c6db05
No related branches found
No related tags found
No related merge requests found
......@@ -525,7 +525,9 @@ static int ogg_get_length(AVFormatContext *s)
ogg_save (s);
avio_seek (s->pb, s->data_offset, SEEK_SET);
ogg_reset(s);
i = -1;
while (!ogg_packet(s, &i, NULL, NULL, NULL)) {
if(i>=0) {
int64_t pts = ogg_calc_pts(s, i, NULL);
if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
s->streams[i]->duration -= pts;
......@@ -534,6 +536,7 @@ static int ogg_get_length(AVFormatContext *s)
}else if(s->streams[i]->start_time != AV_NOPTS_VALUE && !ogg->streams[i].got_start){
ogg->streams[i].got_start= 1;
streams_left--;
}
}
if(streams_left<=0)
break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment