From patchwork Sun Mar 22 03:47:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18330 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 9B43F44BCD9 for ; Sun, 22 Mar 2020 05:48:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84BAB68B591; Sun, 22 Mar 2020 05:48:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF4B768B4CC for ; Sun, 22 Mar 2020 05:48:41 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id l20so10653682wmi.3 for ; Sat, 21 Mar 2020 20:48:41 -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=KRRVkBTLmqvt2LlnLIqLOCOk1bpz+04IowtFXeFjC1Q=; b=SSts9WD01380nhUkYxLaq8VFwv/JOcewdgusAErXLR4Cvm2uud+5WUVSsXmsz0Rjx0 QKBj686wJBf15KIJF2W2FhPlZ9Q6shtQdv3MAH7RtNBcxAtb6e2TlOV3yaIFAILdVUbi oBpCQUXCx7rPEVbEr+U6TfLP9ZVQie0n/uOyhDcwyq8XXvPQws6Yh+8Jv/EBEbtRQ+Ll O+uAbAwqOl4iAB27rlMRhf5BFeHsymp0NXIgg6Oe5R0o68t+qRtuLWFYzXOi5lwv73gz 79BkbQic6edMWbRSzQYjqb2Y0c1mG1OZ7srbz56Cl+rQs8JQPp2U9P5bIOB4uC1LLC4X Qy2g== 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=KRRVkBTLmqvt2LlnLIqLOCOk1bpz+04IowtFXeFjC1Q=; b=Tu3qMn0dDt0WMN55p1nElrJEyaVCoA0RDoZfDpP0eQ2sFr9qguFHLDrfpShea6xbJR OhlyQ68WoCaN4Jgek8RjMxAxJitPHLM282p7AoE5Ma3RCUiBDhwRzJFbwukQK6awquBp zcDXPpd+2112VDN/Vac/kMNwqLiH6ZqHqqn7OnHl3CPO9kImn1tFH0DfgIt/2kZmQpn0 pqGZt0N2GNIGY48g/EUnMThFAhOceHmnOyHv4vXAxzEaCOLhGgJFUVF4zSdWNVpWe3lj 1W6H3XJ0JgXnAm01tWzoRlQZEEhOabqONZZOo8cgxqA5SGJ88j134UJrIIUDL287P6Jz 5UQg== X-Gm-Message-State: ANhLgQ2wZ5O0GK/cvxwRh3MtfFTLtsyUt3OzgXzqpb+TTW1vRZA6eF9g bg6fgNWyTb7y10koQKOeywnpfJOC X-Google-Smtp-Source: ADFU+vtnIJ42wyND0JUYzHUwMp2hpLN/Mez/Xc2GHcPWRGL064Bo4HtGKPrQrGZyoh81YiBQ/HSgRA== X-Received: by 2002:a7b:c0cf:: with SMTP id s15mr20165291wmh.106.1584848920782; Sat, 21 Mar 2020 20:48:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:49 +0100 Message-Id: <20200322034756.29907-14-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 14/21] avformat/microdvddec: Fix memleaks when adding subtitle fails 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" The subtitle queue could leak because microdvd_read_close() would never be called to clean up the subtitle queue if inserting another subtitle fails. This has been fixed by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/microdvddec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index 08e6fca09c..668e317e4b 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -204,4 +204,5 @@ AVInputFormat ff_microdvd_demuxer = { .read_seek2 = microdvd_read_seek, .read_close = microdvd_read_close, .priv_class = µdvd_class, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };