From patchwork Sun Mar 22 03:47:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18325 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 435E644BCD9 for ; Sun, 22 Mar 2020 05:48:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3431468B530; Sun, 22 Mar 2020 05:48:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 930EA68B4B3 for ; Sun, 22 Mar 2020 05:48:33 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id 31so6282666wrs.3 for ; Sat, 21 Mar 2020 20:48:33 -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=c3uCayXtJzh6uNYCPcqlb3Y3lknaXvEwaqQDHs38NMM=; b=AQYLh8L6RsgXCivrcsLujlpcO8DiUCi9iIxeAHfK2gTHt4dt5iNwEv5dBk3ogKjyH7 loOoa2TdiWGfB1el0tP+tzWZ1r1HdhGD/ixuSDwjyl5KT/lSy5jCjROad2wS42b0/K+o lPtnfsSYXRP5RfZy0PSuRvfyJTOSxMLRohdLWjvgDoNITp5GFVSGWgZJCYuJY1mPlKKX KUuLi7+W8eoqBLYvV3pfrjyiYV3eSMWOl1ED0DDgTC/vUWtjN5fMwbIFHRaTbEYU91uG Pb6hUxOtfrcahL4vnRMd12QgJim+dDCkPst9wM5JrYeAKo4M9YxlNFpKhFcr9gXC9Tf8 Yo4g== 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=c3uCayXtJzh6uNYCPcqlb3Y3lknaXvEwaqQDHs38NMM=; b=NVWIXm55fFqQcfUEi34dhAIdEHLnIGsKvvtJj1QLUptR/jUNHvBOe6Gfp6EaoxG5AV ADnMYgJGyUT4NbjZSBpCbO8P1h9OcqO9JIoTJCM/AFnCmvIzf7sxnMsmipTQOAxJXVP+ c1danqQkUPRujTyV0Hzz9DyQRB8asio1kgDkvQDd+oA0AkLdB3hiTAmAzmDNPx9OCjax EhYvY4clozSjewMw3NkMbB63rhj2qLiq389ELgQRiBSnlc4ofHtiWE+KZa4zwjA18JHh fSBGLiAcuWDtozO0yVk4WuEYWpQPjKaHFC3Psbynf3YEfFaK1+bc70c/uti+Cbfs7mGd oWXg== X-Gm-Message-State: ANhLgQ1m9iMiJ1+88vMRMvf5K/lq8voTNxdGZqHHK6Zrb2t/Hb8twTGW SdOKDNpbvq8dMPFKNntFvHXq3Bky X-Google-Smtp-Source: ADFU+vsfxo9Yt0JLVkOMfzuVd/DanQZ5EbpUt2/5O+wKZq1lWC93CP2p5RzXAEewJop4yAKzycFKRg== X-Received: by 2002:adf:a21a:: with SMTP id p26mr20927110wra.102.1584848912762; Sat, 21 Mar 2020 20:48:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:42 +0100 Message-Id: <20200322034756.29907-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/21] avformat/mpsubdec: Fix memleaks upon read_header failure 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" When allocating a new stream failed, the contents of an AVBPrint as well as a subtitle queue would leak. This commit fixes this. It also slightly simplifies the cleanup process by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- This patch and the other patches that involve subtitle queues should only be applied after https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/258790.html libavformat/mpsubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c index 82c73457ea..8bb1e97b8d 100644 --- a/libavformat/mpsubdec.c +++ b/libavformat/mpsubdec.c @@ -154,8 +154,10 @@ static int mpsub_read_header(AVFormatContext *s) } st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); + if (!st) { + res = AVERROR(ENOMEM); + goto end; + } avpriv_set_pts_info(st, 64, pts_info.den, pts_info.num); st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_TEXT; @@ -163,9 +165,6 @@ static int mpsub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &mpsub->q); end: - if (res < 0) - ff_subtitles_queue_clean(&mpsub->q); - av_bprint_finalize(&buf, NULL); return res; } @@ -201,4 +200,5 @@ AVInputFormat ff_mpsub_demuxer = { .read_seek2 = mpsub_read_seek, .read_close = mpsub_read_close, .extensions = "sub", + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };