diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:53:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:53:42 +0200 |
| commit | 775d41b617f0758b0869c7f7edfc947ff393e734 (patch) | |
| tree | 0f826cdfda75bc189bed163cce598bf6b5f148d9 /libavformat | |
| parent | 940ee636301aa73a38e5b3fa025f43901008538b (diff) | |
| parent | c75848cd4c0961f8cfa9dbbce6c8c12641aa5124 (diff) | |
| download | ffmpeg-775d41b617f0758b0869c7f7edfc947ff393e734.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Add support for Tilera processors
wavdec: check size before reading the data, not after.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/wavdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index fff3d055df..7a54b1b8ed 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -223,7 +223,7 @@ static int wav_read_header(AVFormatContext *s) int64_t size, av_uninit(data_size); int64_t sample_count=0; int rf64; - uint32_t tag, list_type; + uint32_t tag; AVIOContext *pb = s->pb; AVStream *st = NULL; WAVDemuxContext *wav = s->priv_data; @@ -340,12 +340,11 @@ static int wav_read_header(AVFormatContext *s) wav->smv_frames_per_jpeg = avio_rl24(pb); goto break_loop; case MKTAG('L', 'I', 'S', 'T'): - list_type = avio_rl32(pb); if (size < 4) { av_log(s, AV_LOG_ERROR, "too short LIST tag\n"); return AVERROR_INVALIDDATA; } - switch (list_type) { + switch (avio_rl32(pb)) { case MKTAG('I', 'N', 'F', 'O'): if ((ret = ff_read_riff_info(s, size - 4)) < 0) return ret; |