From patchwork Sun Mar 22 03:47:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18333 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 74EF544BCD9 for ; Sun, 22 Mar 2020 05:48:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64ED168B5CC; Sun, 22 Mar 2020 05:48:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2C3A68B4A3 for ; Sun, 22 Mar 2020 05:48:44 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id 26so6207195wmk.1 for ; Sat, 21 Mar 2020 20:48: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=Wr60ynPyUPG/lea2jXLiNriab44RZR7vyRdWlscjLxY=; b=BrQpUwDB96/Y/nyOtnCEDppdlv5A75XIG9Fe9Y4fTxR3kK734FXbxptTzcc5Xn5L2c pKhkTryu2q1ofM94wYoVhEy+enwtQkTNSFfAwhz9qF0eg8HjeFVd3ZAsNWQGlFJBzSa/ EK+QqhStgRCADC2eNILKhZ+InqZKWORzSg8l98n8dczb8g//21ArB6t52VSw1Jc1PI4V Bm3PrGC3H5Jh8TkFzFGWWzccQA0b8aMj9fH5iCMIQGXSBnhH+9tyKFpbeCuW4bdlyWd3 Cqzfm71/i+gayhem7e0tZCD8yZlmhTjczctmVAjeBH/x7mIh/T1oi9yY78kLn8hJCzzL PmXQ== 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=Wr60ynPyUPG/lea2jXLiNriab44RZR7vyRdWlscjLxY=; b=EZTw4vncXPzSmbj7qMRqYYnHCQ1/K/h5tqg4whH3M+9XWj/MCs6vumdsZn7w3SbVmN dC+Vhfu0aCYBz01iTKsmhBv14ZJki3lLYHDiTWPFF0GlD9eKYQO1pyF5cL6fpjVHmK7r VIVum+Yt7w3CBaQo1K4TP+zR79F0t2xAvSLGQ/+sJ3bHa9TwK4XB2I/K7G5fUFwVuijV iYLRVdhyrQj1lUhpp+neSHXLGtLXLLV462OkDrKzlnwIK3u2YwThEieZKuGOXKsYnnin oLpfdKAcIn0SqfqE2jm2/CU09/JhpTZzV4mNukwmrArDW9sHdVisiPTEjyFYIt1874o7 dlqg== X-Gm-Message-State: ANhLgQ33ASeENU8/uppOpSvHT5xWz1zwgccspNDSwXveYe3iXJmnvYsT ZIuSsUPP2P61Mwu5jcRc7eN6IvGV X-Google-Smtp-Source: ADFU+vs27M5iqw/xvHSaIwGHS8PQHGAKqyWKJnmnOMV3pDSUfikuKZSW9uprRvU1WEGvh3ni868drQ== X-Received: by 2002:a1c:5452:: with SMTP id p18mr19955154wmi.102.1584848923722; Sat, 21 Mar 2020 20:48:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:51 +0100 Message-Id: <20200322034756.29907-16-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 16/21] avformat/aqtitledec: Fix memleak when queueing 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 would leak in this scenario. This has been fixed by adding the FF_INPUTFORMAT_HEADER_CLEANUP flag so that aqt_read_close() is called if reading the header fails. Signed-off-by: Andreas Rheinhardt --- libavformat/aqtitledec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c index 8cc82a8f39..191a31b2f1 100644 --- a/libavformat/aqtitledec.c +++ b/libavformat/aqtitledec.c @@ -145,4 +145,5 @@ AVInputFormat ff_aqtitle_demuxer = { .read_close = aqt_read_close, .extensions = "aqt", .priv_class = &aqt_class, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };