From: Paul B Mahol Date: Mon, 16 Sep 2013 18:20:08 +0000 (+0000) Subject: avformat/smacker: use av_malloc_array() and check for allocation error X-Git-Tag: n2.1~821 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=78f680cb3664624fedc00d03b0cd77255da2776b;ds=sidebyside avformat/smacker: use av_malloc_array() and check for allocation error Signed-off-by: Paul B Mahol --- diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 062195b730..7279f95a19 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -142,8 +142,13 @@ static int smacker_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Too many frames: %i\n", smk->frames); return AVERROR_INVALIDDATA; } - smk->frm_size = av_malloc(smk->frames * 4); + smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size)); smk->frm_flags = av_malloc(smk->frames); + if (!smk->frm_size || !smk->frm_flags) { + av_freep(&smk->frm_size); + av_freep(&smk->frm_flags); + return AVERROR(ENOMEM); + } smk->is_ver4 = (smk->magic != MKTAG('S', 'M', 'K', '2'));