diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:03:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:10:05 +0100 |
| commit | b4d4e51027e0c55e35c081cb180396ab04099b2f (patch) | |
| tree | e1335b4096cda0fd7fb738723719e09d08771f6c /libavformat/riff.c | |
| parent | 2684d2e3ea8a1a2863ae9842d072341b44b09829 (diff) | |
| parent | 3c370f5abc55739a261534b9f9bdc739cedbbbb9 (diff) | |
| download | ffmpeg-b4d4e51027e0c55e35c081cb180396ab04099b2f.tar.gz | |
Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
riff: only warn on a bad INFO chunk code size instead of failing
configure: Add separate list for libraries and use where appropriate
x86: float_dsp: add SSE version of vector_fmul_scalar()
Conflicts:
configure
libavformat/riff.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 0cb1694d88..684546670a 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -824,12 +824,13 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) chunk_code = avio_rl32(pb); chunk_size = avio_rl32(pb); + if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) { avio_seek(pb, -9, SEEK_CUR); chunk_code = avio_rl32(pb); chunk_size = avio_rl32(pb); if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) { - av_log(s, AV_LOG_ERROR, "too big INFO subchunk\n"); + av_log(s, AV_LOG_WARNING, "too big INFO subchunk\n"); return AVERROR_INVALIDDATA; } } |