From 1116491c53156dd1972eca3e65d5a3b8529c4658 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 20 Oct 2012 16:55:45 +0200 Subject: [PATCH] matroska_parse_rm_audio: check for malloc failure Fixes CID733712 Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ddebf2b697..954cedf8ed 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2043,8 +2043,11 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, } while (track->audio.pkt_cnt) { - AVPacket *pkt = av_mallocz(sizeof(AVPacket)); - av_new_packet(pkt, a); + AVPacket *pkt = NULL; + if (!(pkt = av_mallocz(sizeof(AVPacket))) || av_new_packet(pkt, a) < 0){ + av_free(pkt); + return AVERROR(ENOMEM); + } memcpy(pkt->data, track->audio.buf + a * (h*w / a - track->audio.pkt_cnt--), a); pkt->pts = track->audio.buf_timecode;