From patchwork Tue Mar 31 13:32:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18541 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 6486B449504 for ; Tue, 31 Mar 2020 16:32:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41B3268AFFB; Tue, 31 Mar 2020 16:32:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A809068AFBB for ; Tue, 31 Mar 2020 16:32:28 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id d5so26041945wrn.2 for ; Tue, 31 Mar 2020 06:32:28 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Xyh/FgOWJJhuo9STw3KocKXChQvojZhdBVMWee5evM=; b=ngzBS134NkZFavc2E8FeoqHj3gGi6mrTWK2IS3Rqoi5drO0fh8wIP0u/ZC+j3W5Eoi tCAchT57MlfVDxdDpdSk7Q5EvTBjvhLL/x8npuDV6OOU3UiZU5ZjzhTkrNGP3XqzMmCd LrYMDBZ6Sp3C/IrXzxqY6K0QwlaIsBdMevragpw2mdLK4BBnDFtpnKvwMATfxZ49pr4P yYeJgpOYEtDAQBbHT4Sl2u4KwUi4jxeyfHKAcLqg8URufZ1DsQ3qjkD5Su7PJBelTVHr zGX0/FPeJvnuV4beDFIu1+uCAVWxiCws2vwD2SGy92tfK7uNF0TDQbX6yUDYQYSp99DI jYIA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Xyh/FgOWJJhuo9STw3KocKXChQvojZhdBVMWee5evM=; b=Spuj1YBVKKMMLYej4Zg0Et7NWzwxoWMe3LfgL+LLBh34aiGL+hqpvFHOMGHNZJj7Xo fjGEQ9Mn0LdU/+ZATGv2qhrMsuzAo/NzRjMsArwO6uzGvMUDCp9C5OQMPkFNM+AGoJgG 2sB4YC23TF4RmpBDxwmZtqQxv4SR9YlkGIIePz0222LG6deLYrh61Lj3vQzQXFslrx2g NTa/dczxBoaIGcXReozeP0GZ1haIsrnpQD6WEyAdBSNYxOdQrd2E68Vh5ad1/ZN9nX2m V4EnPbDc955NOdoczejh0rzFSjJFYSL6jQsJfZZvUawdJMP1dwPewlEuCG0ttv/6HxDR uWZQ== X-Gm-Message-State: ANhLgQ0sMlL2y5Ufvs2PogC5UKqUvi+tX2zmXdxX3/70938Axp+Jv84M VE3zPj0ApxzVcoFsCq9XCpaEhy0R X-Google-Smtp-Source: ADFU+vsz5LIFetxoD3cUFEB3TS3YtBiNwaK78rdrxS1L/1pkuv1iIS3KCnUk2KhG4oFX/qyACjve9g== X-Received: by 2002:a5d:4cc2:: with SMTP id c2mr21054358wrt.398.1585661547725; Tue, 31 Mar 2020 06:32:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id n7sm3985471wmf.4.2020.03.31.06.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 06:32:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 15:32:19 +0200 Message-Id: <20200331133219.21079-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-5-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-5-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mux: Fix leaks of uncoded frames on errors 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" If writing an uncoded frame fails at the preparatory steps of av_[interleaved_]write_frame(), the frame would be either not freed at all in case of av_write_frame() or would leak when the fake packet would be unreferenced like an ordinary packet. There is also a memleak when the output format is not suited for writing uncoded frames as the documentation states that ownership of the frame passes to av_[interleaved_]write_uncoded_frame(). Both of these memleaks have been fixed. Signed-off-by: Andreas Rheinhardt --- V2: Now actually resetting the data of the AVPacket containing an uncoded frame if said frame is freed. libavformat/mux.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 814d773b9d..dc8233a0d5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -749,7 +749,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) AVFrame *frame = (AVFrame *)pkt->data; av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE); ret = s->oformat->write_uncoded_frame(s, pkt->stream_index, &frame, 0); - av_frame_free(&frame); + av_frame_free((AVFrame **)&pkt->data); } else { ret = s->oformat->write_packet(s, pkt); } @@ -1239,7 +1239,11 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; } fail: - av_packet_unref(pkt); + // This is a deviation from the usual behaviour + // of av_interleaved_write_frame: We leave cleaning + // up uncoded frames to write_uncoded_frame_internal. + if (!(pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) + av_packet_unref(pkt); return ret; } @@ -1324,10 +1328,13 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, AVFrame *frame, int interleaved) { AVPacket pkt, *pktp; + int ret; av_assert0(s->oformat); - if (!s->oformat->write_uncoded_frame) - return AVERROR(ENOSYS); + if (!s->oformat->write_uncoded_frame) { + ret = AVERROR(ENOSYS); + goto free; + } if (!frame) { pktp = NULL; @@ -1343,8 +1350,14 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, pkt.flags |= AV_PKT_FLAG_UNCODED_FRAME; } - return interleaved ? av_interleaved_write_frame(s, pktp) : - av_write_frame(s, pktp); + ret = interleaved ? av_interleaved_write_frame(s, pktp) : + av_write_frame(s, pktp); + if (ret < 0 && pktp) { + frame = (AVFrame*)pktp->data; + free: + av_frame_free(&frame); + } + return ret; } int av_write_uncoded_frame(AVFormatContext *s, int stream_index,