From patchwork Thu Oct 17 09:06:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15809 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 F11AB448510 for ; Thu, 17 Oct 2019 12:06:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0C8B68A753; Thu, 17 Oct 2019 12:06:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46F4D68A6EA for ; Thu, 17 Oct 2019 12:06:19 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id r19so1714477wmh.2 for ; Thu, 17 Oct 2019 02:06:19 -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:mime-version :content-transfer-encoding; bh=sAq22paVxPbVnFtMDh3QsaFl2RSUG59az4fJxagcuBo=; b=Ep82GaFgjeGO1phIASXxOSg8HtbOY7vIxSVJuCz8J4cg5C7eEVxTnc3YE8PsOLIAkn 0/OGTrVbogykpvRze71JlHZ6bEHfQoXsOale0GS9mWbglc1aVkw+4tF5GfgLLejbfxQL DpTTSJeIOuq1Ht1F3XtqP1JBRrSRX8YJlYiLR2ThOUMIfeZWjJErWopZGYj6PPpYbEym I+QXJkhlcH6+l7gi6yz0fQqOps6ukwWWrBRfk0fX0NCSBpk/mC46rMFVZNBcm3JIvWkG NovOtZ2AENF5NbZMBxtklHhBrwr2KaqW3y4ApAiJthssjf4pGFMdf9PtWWhEKDgrqfcQ x2Yg== 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:mime-version :content-transfer-encoding; bh=sAq22paVxPbVnFtMDh3QsaFl2RSUG59az4fJxagcuBo=; b=YS2YsTLKSweV/LBUeqxjv8j3EiLnEhlcFtEkY+wQTwyv8hwTqWhOV7/owRHIQpAkxf NhVt7ta2sPbyirLSlNwiUKEMflwGMvkBjvA4YGrFFUxO0gzEA6vtT5b/TArvE+l89CUr WhSAOtaFmft+omKSaMnDRiVPgs+SLCKytS0blxzO/0C0Tzos7w5Ut38k87WTkBQg2akJ loXD7XRn4i7F1wstbmCGIsEP+SrvuZZTy/Gyr4Xy5KLZkLvUm4C32ZSol85LpehUHQE/ G3RSOQ+VxadH8zxTIjdTLPA8FfvMcjvnVhNaYxabd/qJXTZxGswLYp5S7u5o/O8nmjjS rVTA== X-Gm-Message-State: APjAAAXQUKRzR6+pEr8N4ALeAJW9l5hXIzhO1+HXjfa3Cq9O2XeMRi0h XnoqKfehnRfx/KWdBWDUKYkleP90 X-Google-Smtp-Source: APXvYqyWFRMyzvQj9BcyecSdM6cQlIqMRiuyLQJK4S5uGIMlnpqGDEjhwF7MSnKOx93cYcCfKPaD7Q== X-Received: by 2002:a7b:c775:: with SMTP id x21mr1988272wmk.52.1571303178646; Thu, 17 Oct 2019 02:06:18 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id w22sm1441766wmc.16.2019.10.17.02.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 02:06:18 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Oct 2019 11:06:06 +0200 Message-Id: <20191017090606.23639-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/nutenc: 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #8295. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index e9a3bb49db..4d10e70e9e 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -1170,8 +1170,11 @@ static int nut_write_trailer(AVFormatContext *s) while (nut->header_count < 3) write_headers(s, bc); + if (!nut->sp_count) + return 0; + ret = avio_open_dyn_buf(&dyn_bc); - if (ret >= 0 && nut->sp_count) { + if (ret >= 0) { av_assert1(nut->write_index); // sp_count should be 0 if no index is going to be written write_index(nut, dyn_bc); put_packet(nut, bc, dyn_bc, 1, INDEX_STARTCODE);