Commit d7d37c47 authored by Andreas Cadhalpun's avatar Andreas Cadhalpun

brstm: make sure an ADPC chunk was read for adpcm_thp

This fixes NULL pointer dereferencing.
Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
parent e7a7b313
...@@ -389,6 +389,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -389,6 +389,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
codec->codec_id == AV_CODEC_ID_ADPCM_THP_LE) { codec->codec_id == AV_CODEC_ID_ADPCM_THP_LE) {
uint8_t *dst; uint8_t *dst;
if (!b->adpc) {
av_log(s, AV_LOG_ERROR, "adpcm_thp requires ADPC chunk, but none was found.\n");
return AVERROR_INVALIDDATA;
}
if (size > (INT_MAX - 32 - 4) || if (size > (INT_MAX - 32 - 4) ||
(32 + 4 + size) > (INT_MAX / codec->channels) || (32 + 4 + size) > (INT_MAX / codec->channels) ||
(32 + 4 + size) * codec->channels > INT_MAX - 8) (32 + 4 + size) * codec->channels > INT_MAX - 8)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment