From patchwork Thu Nov 7 12:54:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "darling.zhong" X-Patchwork-Id: 16154 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 32AA24499F6 for ; Thu, 7 Nov 2019 14:55:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B31168B21A; Thu, 7 Nov 2019 14:55:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m85-63.yeah.net (m163-178.yeah.net [123.58.178.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E05768AFF9 for ; Thu, 7 Nov 2019 14:55:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yeah.net; s=s110527; h=Date:From:Subject:MIME-Version:Message-ID; bh=xBXiW iwgAq7dTNfbNDmHJOJioc2ODQi0wb+ekA5Qjmg=; b=CXZ3WQbfCCUyaGY1o7x3K sGqz4LQ48lH8Vw67NZCclAfjqtf4oXnTVOOqIqX2d2VhtRC/hJPUlsBzNDEJHUmR pnN+5g5LwBqt6+R/aYaOI5f6gqF0dhhISGWiVKQwBecpZf/Tt6I3G19qmKI5RLbg QMqTGCR4yWu/l6THxSQ02E= Received: from dalingzhong$yeah.net ( [14.17.22.35] ) by ajax-webmail-app14 (Coremail) ; Thu, 7 Nov 2019 20:54:55 +0800 (CST) X-Originating-IP: [14.17.22.35] Date: Thu, 7 Nov 2019 20:54:55 +0800 (CST) X-CM-HeaderCharset: UTF-8 From: "darling.zhong" To: ffmpeg-devel@ffmpeg.org X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT5.0.10 build 20190724(ac680a23) Copyright (c) 2002-2019 www.mailtech.cn yeah X-CM-CTRLDATA: CVR3q2Zvb3Rlcl9odG09MTU1MTo1Ng== MIME-Version: 1.0 Message-ID: <3018e68d.ed84b.16e45ee9bc3.Coremail.dalingzhong@yeah.net> X-Coremail-Locale: zh_CN X-CM-TRANSID: P1UQrAB3h+AgFMRdkMsNAA--.47921W X-CM-SenderInfo: pgdox0pj2k003j61vtnkoqv3/1tbiGBBmI1XMd0vIeQACsb X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU== X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] avformat/mov: add free memory when error 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Here may have a mem leak when error Signed-off-by: darling.zhong --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 libavformat/mov.c diff --git a/libavformat/mov.c b/libavformat/mov.c old mode 100644 new mode 100755 index 4f69664eaf..c2e42ea747 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1327,8 +1327,10 @@ static int update_frag_index(MOVContext *c, int64_t offset) for (i = 0; i < c->fc->nb_streams; i++) { // Avoid building frag index if streams lack track id. - if (c->fc->streams[i]->id < 0) + if (c->fc->streams[i]->id < 0) { + av_free(frag_stream_info); return AVERROR_INVALIDDATA; + } frag_stream_info[i].id = c->fc->streams[i]->id; frag_stream_info[i].sidx_pts = AV_NOPTS_VALUE;