From patchwork Sat Jun 27 18:15:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 20653 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 172EB4489CA for ; Sat, 27 Jun 2020 21:15:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6D4768B6BC; Sat, 27 Jun 2020 21:15:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0070668A175 for ; Sat, 27 Jun 2020 21:15:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1593281710; bh=MMUjrG/38GNc52LY9XkvIxNy3EE7nAPtV8HjqvEjJJ8=; h=From:To:Cc:Subject:Date; b=U6Qi/qgMHETGcgUMlPTKrHV43xMZMlQfPv8oGElvRynM78ZGEH6ZadoKxDv0Y4gR1 c3b2KVw+HJGpviUqF3SambT4hKk+vFHU0dkxeP9PILKPrhe5Ib7Mmr6g1/R3e+BrMW 0ZbqQ5lREk5ZKFVFDs1RKMV0idwunDf0y18+Q2IE= Received: from localhost.localdomain ([27.46.106.105]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 3C80F058; Sun, 28 Jun 2020 02:15:08 +0800 X-QQ-mid: xmsmtpt1593281708t64loxx14 Messag-ID: X-QQ-XMAILINFO: NWOZUIcCI2tOdW7FOA6zXQy9+mFjXP5BolReaWa868h1BQof4uFrAO3qrvOvrM I5w2SRSNIeDER7XNTMlY7IALzUi2tCNDJcGj/no7TIuAMdLaXXtS93rcUkjhvB4qDn0Slfa2Imkk 4TlaxTmQKC8OcLBfc7pUISVboQ0JYr+Ioec9kfMKzTdfoOEx9fq83EtX0KqwMgCNzgxLMeilwHud rbICRkrB/lKwlfkPjmZnL9wWCgew0COZjcpCUKliswn0vlkbbcHM4j/g5VU6rakr4iUmzQSIWnH0 TAnEvQBp72mh9OUOsB4TNt1UatyfZLGOA9KSyA89P71TFLJySeQofakiJfjLe1gLef0zendYu3Bi 0zISwnBU5nI1ZjrIlEqRMk83JNyjbdSYsSvwzNvnB0HIsEFTMRRbnmORfl3zyhOCAg7QrRhY0kvD Gu41JvQLxfLcDa2sCK8D/sMDLrenRJnCThkGys79qGfI2jMJxyX393OqRKDUb8RwnNjixP5uHJ6n X2+9blztwYxHKt10L3Ci9sntZyPreuR7Ehw53RLHaXOhA6OB0IamgzQ/fmrbEQEjN7dik2dpzTtb mpxETxdL45CalS+ln0gAwIDNQZi4aosaQVIQ/evrG7Fm/tSQb22y4jOjG/5xkT310azSLMpPRlMy EdlJfWw66de+WD/BYaXdWWQiNuvD/dpboRLJfWDQJuMe6CjAaatVbg8fw= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jun 2020 02:15:02 +0800 X-OQ-MSGID: <20200627181502.170990-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20200627181520.E6D4768B6BC@ffbox0-bg.mplayerhq.hu> Remove the check on dv_demux since dv_fctx will leak if allocate dv_demux failed. --- 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++) {