generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oggdec: fix out of bound write in the ogg demuxer

Browse Source 
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Laurent Aimar 2011-09-11 23:26:12 +02:00 committed by Luca Barbato
parent 7574cacbd5
commit 0e7efb9d23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/oggdec.c
View File

@ -92,14 +92,24 @@ static int ogg_restore(AVFormatContext *s, int discard)
ogg->state = ost->next; ogg->state = ost->next;
if (!discard){ if (!discard){
struct ogg_stream *old_streams = ogg->streams;
for (i = 0; i < ogg->nstreams; i++) for (i = 0; i < ogg->nstreams; i++)
av_free (ogg->streams[i].buf); av_free (ogg->streams[i].buf);
avio_seek (bc, ost->pos, SEEK_SET); avio_seek (bc, ost->pos, SEEK_SET);
ogg->curidx = ost->curidx; ogg->curidx = ost->curidx;
ogg->nstreams = ost->nstreams; ogg->nstreams = ost->nstreams;
memcpy(ogg->streams, ost->streams, ogg->streams = av_realloc (ogg->streams,
ost->nstreams * sizeof(*ogg->streams)); ogg->nstreams * sizeof (*ogg->streams));
if (ogg->streams) {
memcpy(ogg->streams, ost->streams,
ost->nstreams * sizeof(*ogg->streams));
} else {
av_free(old_streams);
ogg->nstreams = 0;
}
} }
av_free (ost); av_free (ost);