diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 05:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 05:03:39 +0100 |
| commit | 7209c2b13f0bfaf4029ebb54a18ebb6959d2e3a3 (patch) | |
| tree | d9b2115c63a03d547094eb5e430297e5339f0b92 /libavformat/matroskadec.c | |
| parent | e75056bc549fe13bb6d29a8a67a6a2babf060417 (diff) | |
| parent | 7ee536e87a569174775dabdd959a9b12c1d2ac3d (diff) | |
| download | ffmpeg-7209c2b13f0bfaf4029ebb54a18ebb6959d2e3a3.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
vorbis: Avoid some out-of-bounds reads
vp3: fix oob read for negative tokens and memleaks on error.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 0d75c5c13f..7350562402 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1063,13 +1063,13 @@ static void matroska_convert_tags(AVFormatContext *s) static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) { EbmlList *seekhead_list = &matroska->seekhead; - MatroskaSeekhead *seekhead = seekhead_list->elem; uint32_t level_up = matroska->level_up; int64_t before_pos = url_ftell(matroska->ctx->pb); MatroskaLevel level; int i; for (i=0; i<seekhead_list->nb_elem; i++) { + MatroskaSeekhead *seekhead = seekhead_list->elem; int64_t offset = seekhead[i].pos + matroska->segment_start; if (seekhead[i].pos <= before_pos |