From patchwork Thu Oct 10 03:40:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15662 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C94BD44A020 for ; Thu, 10 Oct 2019 06:40:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B31F66881EC; Thu, 10 Oct 2019 06:40:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28A646881D3 for ; Thu, 10 Oct 2019 06:40:45 +0300 (EEST) X-QQ-mid: bizesmtp19t1570678832tgewm5bx Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Thu, 10 Oct 2019 11:40:31 +0800 (CST) X-QQ-SSF: 01100000002000K0ZRF1000A0000000 X-QQ-FEAT: s8YYpWqVDdfzNHszMr/zon63YbktqqIeCsOhgjPSsJX9Bnhcx/woFYyL5e9e7 ERF7eNbXi7iapw5pQk80J0o3sfmtRRXh5OP+hmcb+W8GBwYtuve23RKGt9n3cAhxhYZSRTG 6uQFyg874VaM7Y+eC/L8vM2bj0GszFgoMIw0hDhu2dgsY3oU8R+al3bkXdUrVDE4PPWs061 Dgs/q4cdSVIGNPvrFfAwD5WP/Et2Qa9LD8itJj0bHz6dIF/hwkdV01Lq2fOznOQnQtCwyyc HQd2b//IhRM5Nbz+d2szkUKivYeGmKdMraEiSM1JiBX48MPLqnAbV8w1KJ/CviX0DHnkD8T tjvw5Yk1uUDbQZo8jQ= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 11:40:09 +0800 Message-Id: <20191010034011.1205-6-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191010034011.1205-1-lq@chinaffmpeg.org> References: <20191010034011.1205-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v1 6/8] avformat/mtv: check av_strdup() return value and fix memleak X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/mtv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 728f4a4781..c664ae14c7 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -171,13 +171,19 @@ static int mtv_read_header(AVFormatContext *s) st->codecpar->width = mtv->img_width; st->codecpar->height = mtv->img_height; st->codecpar->extradata = av_strdup("BottomUp"); + if (!st->codecpar->extradata) { + return AVERROR(ENOMEM); + } st->codecpar->extradata_size = 9; // audio - mp3 st = avformat_new_stream(s, NULL); - if(!st) + if(!st) { + av_freep(&st->codecpar->extradata); + st->codecpar->extradata_size = 0; return AVERROR(ENOMEM); + } avpriv_set_pts_info(st, 64, 1, MTV_AUDIO_SAMPLING_RATE); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; @@ -187,8 +193,11 @@ static int mtv_read_header(AVFormatContext *s) // Jump over header - if(avio_seek(pb, MTV_HEADER_SIZE, SEEK_SET) != MTV_HEADER_SIZE) + if(avio_seek(pb, MTV_HEADER_SIZE, SEEK_SET) != MTV_HEADER_SIZE) { + av_freep(&st->codecpar->extradata); + st->codecpar->extradata_size = 0; return AVERROR(EIO); + } return 0;