diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 15:54:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:10 +0200 |
| commit | 9ac72b1dde34bd17ac6b8bdf57c82a4f609a917b (patch) | |
| tree | ad477a66779c70d4bbf8fb0273ea8237d716ed2c | |
| parent | 9d5362a45cbd8777751e8a98e7cb8c26f180868c (diff) | |
| download | ffmpeg-9ac72b1dde34bd17ac6b8bdf57c82a4f609a917b.tar.gz | |
avcodec/wavpack: Check L/R values before use to avoid harmless integer overflow and undefined behavior in fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 042260cde4ecf716438c5fc92d15ad5f037ee2e1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/wavpack.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 82c9b37312..80930f5fa3 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -630,6 +630,14 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb, s->decorr[i].samplesB[0] = L; } } + + if (type == AV_SAMPLE_FMT_S16P) { + if (FFABS(L) + FFABS(R) > (1<<19)) { + av_log(s->avctx, AV_LOG_ERROR, "sample %d %d too large\n", L, R); + return AVERROR_INVALIDDATA; + } + } + pos = (pos + 1) & 7; if (s->joint) L += (R -= (L >> 1)); |