diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-09-23 19:07:48 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-27 23:28:43 +0100 |
| commit | 40ebeee3fc3516ede3709427e3b23c13a8a045fa (patch) | |
| tree | 23610e118f5dc0c7553839c1813911d50830724a | |
| parent | b8fa3ff95d884060f39c5d50e811404fe94b9301 (diff) | |
| download | ffmpeg-40ebeee3fc3516ede3709427e3b23c13a8a045fa.tar.gz | |
avformat/brstm: fix overflow
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 3441fef0f8bfcdfbad69b49b7fc526fcdb2185cd)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/brstm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/brstm.c b/libavformat/brstm.c index 7ad40b0b19..6eae9d9e53 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -389,6 +389,10 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) codec->codec_id == AV_CODEC_ID_ADPCM_THP_LE) { uint8_t *dst; + if (size > (INT_MAX - 32 - 4) || + (32 + 4 + size) > (INT_MAX / codec->channels) || + (32 + 4 + size) * codec->channels > INT_MAX - 8) + return AVERROR_INVALIDDATA; if (av_new_packet(pkt, 8 + (32 + 4 + size) * codec->channels) < 0) return AVERROR(ENOMEM); dst = pkt->data; |