[FFmpeg-cvslog] avformat/matroskadec: use av_malloc_array() and check for allocation error

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Sep 16 18:03:27 2013 +0000| [3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46] | committer: Paul B Mahol

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

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
---

 libavformat/matroskadec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 76c610b..8bbbf68 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;