From de4ded06366e5767d0af277a61d9a56b8c8f9c19 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Thu, 17 Nov 2016 22:46:40 +0100 Subject: rmdec: validate block alignment This fixes division by zero crashes. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun --- libavformat/rmdec.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index d1758628ad..4d565291af 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -934,6 +934,10 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, ast->sub_packet_cnt = 0; rm->audio_stream_num = st->index; + if (st->codecpar->block_align <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid block alignment %d\n", st->codecpar->block_align); + return AVERROR_INVALIDDATA; + } rm->audio_pkt_cnt = h * w / st->codecpar->block_align; } else if ((ast->deint_id == DEINT_ID_VBRF) || (ast->deint_id == DEINT_ID_VBRS)) { -- cgit v1.2.3