Browse Source

avformat/smacker: use av_malloc_array() and check for allocation error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n2.1
Paul B Mahol 11 years ago
parent
commit
78f680cb36
1 changed files with 6 additions and 1 deletions
  1. +6
    -1
      libavformat/smacker.c

+ 6
- 1
libavformat/smacker.c View File

@@ -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'));



Loading…
Cancel
Save