From patchwork Thu Apr 4 16:08:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12614 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 C7834449678 for ; Thu, 4 Apr 2019 19:09:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A30F568A964; Thu, 4 Apr 2019 19:09:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0931868A92C for ; Thu, 4 Apr 2019 19:09:01 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id ck15so1406267plb.3 for ; Thu, 04 Apr 2019 09:09:00 -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=I3VCPsRRaFrmJ4ySjWnKuKHVZTqvyv0w8KC8QcTLBl0=; b=rm6XeSeCSuJIoQBlIfyrbOBEekpscNfZo4ok/tHtaIaknOeF3DmKSsxH6Da4OiXf60 Gf78obUQzfGrt30DprfUwGJCQ76zeqpvYk1+vXqSHHUpfF8IfiwJdyGZ4JlFGZQyBiXa qmiXXeK2sCiY5K3KjRjInbN1EwSkF+PFdVoc2IM8+42jfXbkXG9AnCGi5opyEcZna9lp FdRGIFbvsfwLnotml01HW0QpDTkLMbgBgkDV8MouZWnJko7HJg+K2u/h5KYtGdhzDHYo hpXD4BcFUX49oBlXlGfoCO+4USP6y8NvRI+3FNqH9eA+kjQtL3opS4tzI6nRKz73f8ER LPEA== 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=I3VCPsRRaFrmJ4ySjWnKuKHVZTqvyv0w8KC8QcTLBl0=; b=hgGtVd3l6BqqUq34AXe9UBquh4r2QSHKygQYP58w2jYsCd3YPUCPPhgbrKzJgv/CXd fFSRuyC5MOSoii8MUbvAU/Xe92NBwRbI1LvWJxPLI32pxNI3fyQwAPOOdDoZxn6Knh9o IM/hZUpRC50255MUNIc2i0Pf47+pGhGbPzzKdf4ss32/V5qEvke8YABwUeBuATmB8DRU oH7S7wGtvXdm45dUEj6CBkPmqr7gHbzCmsupZsk6ycTaNtVecdymPZb5DuVwjfrCvwYo lRZ/CSo7GNKtPcixKE7kpQKUhTsBDsYsWOzIe6B24o5x4z6D/Y99aLqDPDjYnJB5gcHz dtnQ== X-Gm-Message-State: APjAAAXaGN1io2iOPxcaUyoEQbvP9mHe+WFNjoSrNIhb41FhWZ4gg4yP 1BS2umj5EAxik97yK+N+nBe/rzsL X-Google-Smtp-Source: APXvYqyEIrxMTBcdi4NSu3m3AAaH39e1qF5tci68mBdCNMtDAHMo7q7h0GrAOp8+v/hI3woiGVuDvg== X-Received: by 2002:a17:902:7794:: with SMTP id o20mr7104373pll.189.1554394139087; Thu, 04 Apr 2019 09:08:59 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id l69sm26512191pga.73.2019.04.04.09.08.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 09:08:57 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2019 00:08:53 +0800 Message-Id: <1554394133-25560-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V2] 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, only store a audio packet whose buffer has size greater than zero in cur_audio_pkt. Thanks to Andreas Rheinhardt for the suggestions. Signed-off-by: Jun Zhao --- libavformat/matroskaenc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b9f99c4..06f3aeb 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2534,7 +2534,8 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) // buffer an audio packet to ensure the packet containing the video // keyframe's timecode is contained in the same cluster for WebM if (codec_type == AVMEDIA_TYPE_AUDIO) { - ret = av_packet_ref(&mkv->cur_audio_pkt, pkt); + if (pkt->size > 0) + ret = av_packet_ref(&mkv->cur_audio_pkt, pkt); } else ret = mkv_write_packet_internal(s, pkt, 0); return ret;