From patchwork Sun Mar 22 03:47:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18335 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 F039A449790 for ; Sun, 22 Mar 2020 05:50:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E2C068B54C; Sun, 22 Mar 2020 05:48:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2FED68B57F for ; Sun, 22 Mar 2020 05:48:46 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id d1so10639065wmb.2 for ; Sat, 21 Mar 2020 20:48:46 -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=cDF1ewrS74Hi9qolHbkEGCt+sBC0gTVWWWI7/0o0m/M=; b=OlkZVSpVO4KC+NLPRKtO6x8vO8vBlPz9Qftbmo7z2PzaUVLCLP5YbkX9IK7VW/lbfi rU4Ti9eY+uKlDMUP3rrK0ZP3G9u5HPZjkfSb9rcyX6kwv+Y07c0IHHoY8SDaHZHfdwUX QTzl+nIwZDSQUkzPLFkHPZ273gEX7wngrhu3Gc8+2+Ej472ucmnT3o0CAuvzMts0Twvt 5HW2q/ijC+s4YM0xkKJ6gVnI2AjEzJJhYKLNTKrHpZRMZEVBwFHOt+CFb9I/4Y+2l/MU mK+B3C4DBP1F2wxbiAhQGqCaOWQIbILmlqkX+qhTB1sncXpuxx1YDt9tSvzJB5ybCgt0 Jt5w== 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=cDF1ewrS74Hi9qolHbkEGCt+sBC0gTVWWWI7/0o0m/M=; b=aJMS3lpMoQuOVXyAqGdI5SAUlt9CvRwY7fOXUJ22Hp3sVuZsWn/e+ivJI9C+/5Cp9v FFzjq+I1iPft1uonsPTgYe/gf96eJYV4kXZFQ+xNe6FQlZdjPLA5/Obq6423X/yYx3s6 UuAm3Ayy1VuMZgeRkGvTu82NP28baEMaKkBRqg1I8tbvy0/LdDo0I2/KU1VuKXnkkbQY WVrFWPyonGDRNHWerM0jFBDIog4TPZqdlW/AC4se0mPxFFAf5eMzF9DOUjFC/Vgd3rOu ilDqXdASb2wST8+imfvASGvN9fY6tY9SpPdAA4BK4EXpsDEYRbRAKRdw15jBcT7wHay6 Rnzg== X-Gm-Message-State: ANhLgQ351P4KBJGKyhVPsod/AurEpcRSz2eFsRsNqmIdabT8T3DA/CIq XwE5KQFUOHvfMTf/cHBqTvL9E3kD X-Google-Smtp-Source: ADFU+vvspIcBkq9giYhOWkCu8FldGSqnnW/yEsKknPd4Tn3xyUgVudPZJp3McRKqbxu1j0EaLy7XaA== X-Received: by 2002:a1c:1d8e:: with SMTP id d136mr5520754wmd.26.1584848926091; Sat, 21 Mar 2020 20:48:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:45 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:53 +0100 Message-Id: <20200322034756.29907-18-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 18/21] avformat/assdec: Fix memleak when reading header 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" In this case, the subtitle queue would leak because ass_read_close() is not called automatically when reading the header fails. This is changed by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/assdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/assdec.c b/libavformat/assdec.c index f66b296673..d9e0af264a 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -189,4 +189,5 @@ AVInputFormat ff_ass_demuxer = { .read_packet = ass_read_packet, .read_close = ass_read_close, .read_seek2 = ass_read_seek, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };