From patchwork Thu Apr 4 09:25:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12612 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 834A9447352 for ; Thu, 4 Apr 2019 12:25:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64DE068AE33; Thu, 4 Apr 2019 12:25:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B777E68ADB7 for ; Thu, 4 Apr 2019 12:25:38 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id m10so861665plt.10 for ; Thu, 04 Apr 2019 02:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=sJQULecdXYPwS/Fb0CZDqTMTJMuPWgSCAXlZ7ad2CGE=; b=idVT8tvSRPbhPpctXOAeqaRC/VZ/YZG+hdWynBo7m6w40uTWFlENRn/MIY9p/18gtc JgQbVdaUlvEym4yktCynwv/ZWDIVbJbCS7hybjKxBWSLrpZo/sAPm2CMSjs7ReVvrs0E M+wE81+EgfSWN6SPbrgsa5s0jhTUsVvlPmS/zpUS/1sPaFZ38UCgQxtGFhJQetF5Jmpu Lwv9M8Goo3o3KtO4vA3FmxkIzX9DAXTqYw9Ynd8hYANKSqo13WcU1QJAG2zjMsQxDl0c jJ2OFkahDjZq+ev6XrnDziRIyUuZ/H8cxxSfJw3bbtA0vburQOh98PHvmTeLkUAkokUM uwcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sJQULecdXYPwS/Fb0CZDqTMTJMuPWgSCAXlZ7ad2CGE=; b=qFy96zEKo53Z1+dKbA/DusrZ3h+vVqHaMQ3Hg8ZSKo2YOBeXsPuy+Ae2APHudrQq9g rTAAVMUAF9EhOc8gzPizWyoKD2tGKDmMBs885fvy+H+vSLLxli1OG32Q5uc1Um885wmD O0L8m+XBY2neD7CVV94DH6OSXNxc5YPS7JhYSE8DYh9hJEK7KV97h0zfzkU8Zyy2vrwI Ao1RXj52PnHO+xYyRIZzgkXNBDf2JyQf0hKpgjObRwodrsDkmkjtcdHlm8iZYak9y9gf QRAVnNrIYuUAU/RgJHzZo24vhuixzZ4UopWBZzASFakKzgFe1uv8s2NPFYhtTjmOZOx7 ESDg== X-Gm-Message-State: APjAAAV4fwslavPH/Mj+GQG2dDMygshnZi14QdtsbGFa7oxTyYy/du4E ALdab4NzkGTqAsgcJRLQiPlzkZVh X-Google-Smtp-Source: APXvYqxouCokEIhXEHfeiOHObInAQB5hM+kAMXAiPw78sykr5zPW5cJVUk5Gg9agHiF0my+V1GXIDw== X-Received: by 2002:a17:902:2989:: with SMTP id h9mr5366597plb.26.1554369936795; Thu, 04 Apr 2019 02:25:36 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id a17sm10353894pgd.30.2019.04.04.02.25.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 02:25:36 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2019 17:25:31 +0800 Message-Id: <1554369931-21029-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavf/matroskaenc: Fix memory leak after write trailer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Fix memory leak after write trailer for #7827 Signed-off-by: Jun Zhao --- libavformat/matroskaenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b9f99c4..22ba93a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2571,13 +2571,13 @@ static int mkv_write_trailer(AVFormatContext *s) // check if we have an audio packet cached if (mkv->cur_audio_pkt.size > 0) { ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, 0); - av_packet_unref(&mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); return ret; } } + av_packet_unref(&mkv->cur_audio_pkt); if (mkv->dyn_bc) { end_ebml_master_crc32(pb, &mkv->dyn_bc, mkv, mkv->cluster);