From patchwork Wed Oct 9 07:35:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15589 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 B83EA447223 for ; Wed, 9 Oct 2019 10:36:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4B176881C9; Wed, 9 Oct 2019 10:36:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53C6B6881A8 for ; Wed, 9 Oct 2019 10:35:54 +0300 (EEST) X-QQ-mid: bizesmtp19t1570606537tqluylsn Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Wed, 09 Oct 2019 15:35:37 +0800 (CST) X-QQ-SSF: 01100000002000K0ZRF1000A0000000 X-QQ-FEAT: vqkrgw89Zslqjy0s5D6O5C/SLhFqZARxliVMMS9FdciPPG1O5St+J0FEoWBDQ PIQGwbpkK+jPb8DqnrzVOCWMhoVCpFb0Un21sZi9e2mHgzGRLa3xj75sYQbTI1wh5MTrVyc PXQj07FD+e7JU5uZMGot0px503AG571hhTJw423XUflKTeQbttvEyjyuuo78NYYGThfZxz1 WOc+iuwlwtlCRdIf91qrcbad7YSrTaZspNb7MuoRnbqHORkQe4ZdwH1UgnPYWRK02ZfEw1d GqJMr8OeGnzqjzHXjtSFbjntFKu9MepktGXvV3JmirW3olBf5KJo3W6wwqJxKQD/A0uA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 15:35:22 +0800 Message-Id: <20191009073530.4505-3-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191009073530.4505-1-lq@chinaffmpeg.org> References: <20191009073530.4505-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v1 03/11] avformat/iff: fix memleak when get st->codecpar->extradata failed in iff_read_header 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/iff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index f4d806b7b8..2a3729f97e 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -529,8 +529,11 @@ static int iff_read_header(AVFormatContext *s) st->codecpar->extradata = av_malloc(data_size + IFF_EXTRA_VIDEO_SIZE + AV_INPUT_BUFFER_PADDING_SIZE); if (!st->codecpar->extradata) return AVERROR(ENOMEM); - if (avio_read(pb, st->codecpar->extradata + IFF_EXTRA_VIDEO_SIZE, data_size) < 0) + if (avio_read(pb, st->codecpar->extradata + IFF_EXTRA_VIDEO_SIZE, data_size) < 0) { + av_freep(&st->codecpar->extradata); + st->codecpar->extradata_size = 0; return AVERROR(EIO); + } break; case ID_BMHD: