diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-09-16 18:03:27 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-09-19 22:28:25 +0000 |
| commit | 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46 (patch) | |
| tree | 051afbd46d9b1e6bd6cf6004639e4dcd8a7ef1d1 /libavformat/matroskadec.c | |
| parent | 13eff473adb00cc44d1a1800070f4c928e08b15b (diff) | |
| download | ffmpeg-3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46.tar.gz | |
avformat/matroskadec: use av_malloc_array() and check for allocation error
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 76c610b214..8bbbf68ced 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1770,7 +1770,9 @@ static int matroska_read_header(AVFormatContext *s) track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 || track->audio.sub_packet_size <= 0) return AVERROR_INVALIDDATA; - track->audio.buf = av_malloc(track->audio.frame_size * track->audio.sub_packet_h); + track->audio.buf = av_malloc_array(track->audio.sub_packet_h, track->audio.frame_size); + if (!track->audio.buf) + return AVERROR(ENOMEM); if (codec_id == AV_CODEC_ID_RA_288) { st->codec->block_align = track->audio.coded_framesize; track->codec_priv.size = 0; |