From patchwork Tue Mar 31 12:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18539 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 1268E44AF30 for ; Tue, 31 Mar 2020 15:46:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED85768B2DB; Tue, 31 Mar 2020 15:46:50 +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 7C16268B303 for ; Tue, 31 Mar 2020 15:46:44 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z14so1990296wmf.0 for ; Tue, 31 Mar 2020 05:46:44 -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=VLwy7pPjPjRov5XfUkv4/g5s3fDHC/TLCEaornXk9ls=; b=XNP5a5FaLdvMZSOZNE/mOy0fVGEMWNU01ZAQr3J2kWa84CaH/smRrL8+UIHHrMH82H 7DZlPXiQxdXHnISsCTVqA3UKcTe6tB5oMY5D/eVG0bRbG8T9+H9ws3z1Ah8znaSfrlWC v4o2ezkuD8QXNEyeZ7n4LCcRTKHwsC3rrlW3m7SazcQdJ59W/RpzOFAjMo/pWe+DSNPt X1o6E5RTng3vuaFU6xaVz2Iqj7bzSETZdZjhfa72scNzG/fKsC6kcXw+r7A76/ijwsmW rZU+G5+nNeyUTAE660uM7Cq6xZnL+P/P6C0Kyes/rx3eHouxLKqOOG0NlEeHgB5UONzn eqFw== 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=VLwy7pPjPjRov5XfUkv4/g5s3fDHC/TLCEaornXk9ls=; b=i5f4hYYRp7CNxuvcI7LYd11vGIbFm3rpaSTOJdYWk1MjlElcWABjennLdebY5n1kdB 7qmn3u2+E/s+BL0b5VLWtBRqHVoJn3d7xTRkJKiaf30ZqjS+dF6s1n980wms+MYJHZle a55K6dzGHYX2lc/g+J6qgLwNmkC6zanLOOp7lCTwfkes86pEuIt+e9pyApsJM9gS6KZv KWI/WmDHxMJHfE6k/AylqZ4FmH1dO72h6dmXGc8YGsga17Ws2ikN3UNDAEkj+69n2qhE hdo6WuIhpSG/Nw4cchVckaSNyTCjsOb0m4e+Wvok0kuog2JotyGYjqHdfsJK2g6wlXtm 1OBw== X-Gm-Message-State: ANhLgQ2JFnNcIwGhncCW4fKA8ey55HWxof3LiHeBBTq+kis1hvzdN0XH +plth7bxBNUsibfaNEUc+2Bje2pL X-Google-Smtp-Source: ADFU+vuK22gbuOxDM1SlP6AQBDbHjY2sVNbfu7MZOD/uLogFOrh4iN4BP/0RlNVPgDEXYui/jxvQlA== X-Received: by 2002:a1c:e442:: with SMTP id b63mr3403157wmh.174.1585658310691; Tue, 31 Mar 2020 05:38:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id p13sm26301532wru.3.2020.03.31.05.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:38:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 14:37:39 +0200 Message-Id: <20200331123745.6461-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] 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 --- libavformat/mux.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 814d773b9d..a0ebcec119 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -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,