diff options
author | Laurent Aimar <fenrir@videolan.org> | 2011-09-11 23:26:12 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2011-09-17 09:41:02 -0700 |
commit | 0e7efb9d23c3641d50caa288818e8c27647ce74d (patch) | |
tree | b99647042e3dda7681c178f41918d8b45799e311 | |
parent | 7574cacbd5343bc303ee8333956274716e2444d5 (diff) | |
download | ffmpeg-streaming-0e7efb9d23c3641d50caa288818e8c27647ce74d.zip ffmpeg-streaming-0e7efb9d23c3641d50caa288818e8c27647ce74d.tar.gz |
oggdec: fix out of bound write in the ogg demuxer
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r-- | libavformat/oggdec.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 3d03a5f..85f7ec7 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -92,14 +92,24 @@ static int ogg_restore(AVFormatContext *s, int discard) ogg->state = ost->next; if (!discard){ + struct ogg_stream *old_streams = ogg->streams; + for (i = 0; i < ogg->nstreams; i++) av_free (ogg->streams[i].buf); avio_seek (bc, ost->pos, SEEK_SET); ogg->curidx = ost->curidx; ogg->nstreams = ost->nstreams; - memcpy(ogg->streams, ost->streams, - ost->nstreams * sizeof(*ogg->streams)); + ogg->streams = av_realloc (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); |