From patchwork Sun Jun 28 03:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 20658 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 F194E4491C4 for ; Sun, 28 Jun 2020 06:16:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6EA768B75A; Sun, 28 Jun 2020 06:16:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-236.mail.qq.com [203.205.221.236]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6686568B6CE for ; Sun, 28 Jun 2020 06:15:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1593314151; bh=PG0U4COTgqRdzp9+Xr92o94vXsP6YuT68+3zZQybvBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Is0/448YQwCnABPjLF/bmSA8mHqCbjB5N2aNkyF2hEr3+QydpHuzHebOAV1vJvqs6 m2MYQOJQzz0/iw6hSCJgrrbK8zSZAwdefOzj9DzDqlXNvLrkIrTX0P+nVY+Zlvoefa d9VxwyTywSJp+cImiaDJScFNZLiNImfnu02m7TvQ= Received: from ZHILIZHAO-MB1.tencent.com ([14.17.22.52]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id 3EC3F027; Sun, 28 Jun 2020 11:15:44 +0800 X-QQ-mid: xmsmtpt1593314144th41lyyhg Messag-ID: X-QQ-XMAILINFO: NT0iLL/oakAduELJ02Fm/xv/6UyrvhHO3ut9CeVSgFQjWXhXNY1B+BRH2AFc4f 4FXHsqfhtnqaa52vDkNrDr91P7lAwieSxfWnEIXm7xgoylpF04sU3780QelunC7UmLj9D4VycCEn YkJylh1FeGD0YodGODciLvzsGR7KQLuO5dP0FmSm8bq3bJeAUGhqFQIUWaGp+hNzY0aurycGUiQm z2usQ4prZ2gp2yDW3bmrKs/m19UpHDpaqwPNMkbgla1NhqVSTfXdHR6z3DIDl3j1nOogxdZYUAkB lc/PnY+KYJ8qZsrXg/9tE0uzZ/o57HlBb5/XqXLBi2Q9LvO037MSK88zfjG8BfsSnJ8RRAg8mL5J 0r+6SJG6TidFM+3irRmnZpJlzVVzCMJDwoXaChdTjUEqhQvodk5UXFe18cfGvGFFpeLZzLBHUU6k Lc5Yky8BtGFTqvZ+tzo+9P15nl0lhhsfn//UCBvEBz0iqNYRTz3ZvnGSVRwhqJoE+HEog6cSb4eQ FenBsk7Xihdq0Gf93a8mLAcRFlRtEU+L+oAF0V+XBC/yC2HLl1qLYhGBBH5hbSTQzsw3FrD0H816 DY05Th6DJq4EdsR7Q5c6VeWdKCrhB8wct3Kaiw/AZfzFMG0bdSp9dEOPQt6SGhgtURKXJpZsYPvx BXl9511C+4174kKbhkX2I2EtX2npRVPfox8UTmrB9drb83m+ABCfNPGsY= From: quinkblack@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jun 2020 11:15:39 +0800 X-OQ-MSGID: <20200628031539.86220-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <92ee5aae-b6b1-0b51-93ec-79dd95462d51@gmail.com> References: <92ee5aae-b6b1-0b51-93ec-79dd95462d51@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix memleaks 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20200628031600.C6EA768B75A@ffbox0-bg.mplayerhq.hu> From: Zhao Zhili Fix two cases of memleaks: 1. The leak of dv_demux 2. The leak of dv_fctx upon dv_demux allocate failure --- libavformat/mov.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index adc52de947..f179b6efdd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7357,10 +7357,9 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->coll); } - if (mov->dv_demux) { - avformat_free_context(mov->dv_fctx); - mov->dv_fctx = NULL; - } + av_freep(&mov->dv_demux); + avformat_free_context(mov->dv_fctx); + mov->dv_fctx = NULL; if (mov->meta_keys) { for (i = 1; i < mov->meta_keys_count; i++) {