From patchwork Mon Aug 10 01:10:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21574 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 F30DB44A9B8 for ; Mon, 10 Aug 2020 04:11:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCB0B68ABFA; Mon, 10 Aug 2020 04:11:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7976568AB04 for ; Mon, 10 Aug 2020 04:10:54 +0300 (EEST) Received: by mail-ed1-f67.google.com with SMTP id cq28so5021677edb.10 for ; Sun, 09 Aug 2020 18:10:54 -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=6q/T5sBhuilwbvJASymiCVzF6DjHOefdZXgu/2plgtQ=; b=fTRdbMNy1w92MQ3+GoncDF707fmilGvdZcEMFF7Dkxj6ffYelX+PqRouFzruDLwxLJ G+Wgv93NdPknPSkM5Bpy/tfwUrSOdM601ST3/laCo1Iqj0kc9WZMoUT2DCKyy/Qof/7M 08J//EOJoNKhtX8R3ndVMf6ApRucCK6xI/aYQ5blRXdoMqI/38v1KogHa7toSs8nYS98 F4ijva92Da5d+5XM3xubQL8jBXfPfIKek8nEkdPIH79PzDKFZiBtoMmr/1sPoCn9NPJB AwSHXAi+y11AswtRDTHkTtZ0/4TFPmZpCV3JQrKNLdVNF6EmQ2SxRyMaA6BhobOotNc8 GQkw== 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=6q/T5sBhuilwbvJASymiCVzF6DjHOefdZXgu/2plgtQ=; b=nESJ5yJDIqGAsibJkX03Y6KPApRwtgSNUU4bvnTOhNwmslEFh4mD+O0wtOoYyQtWa5 PHGiwonTIq7QlAnF3c4iNeO8/vyGlTNW3ppIHiwC77BeTfuYDF+d46ClXVuKC173kfVl /W+GYGJc74WvmKud6Nqm1kn12ENuFvB6u6ZzsfOaPWlxo4feWAFFmKo2ES+iyGFvoWPP K5gLANZYd0gFUqVd0XfCp4AQ9fbCJp4cYF/idbrON13uJpA3tE+jAFDMRYBn+TeJ3TXF 17YbYYtrElizXGBZsibdkOOY+BJE/wn8p3UrnPGX9H0lyCHWEQmfabeBZ03JPIxFF4/X IBuA== X-Gm-Message-State: AOAM531Ay/htIWdUcN+glE+KFUV8PlXm2bz74sCR6rmXDkh37JIWUuGU nBcHgmhs+bc9PV/gH6mW7wEz8H5L X-Google-Smtp-Source: ABdhPJw+0bGRctWPeKo1lhahfrO1/0bf4SpO9OyaggcZdlfPhy58Ms1rcE4TYW5Pr+UHZ3VLOzPaxA== X-Received: by 2002:a05:6402:8cb:: with SMTP id d11mr19543805edz.100.1597021853781; Sun, 09 Aug 2020 18:10:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id qk30sm11706097ejb.125.2020.08.09.18.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2020 18:10:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Aug 2020 03:10:22 +0200 Message-Id: <20200810011023.17540-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810011023.17540-1-andreas.rheinhardt@gmail.com> References: <20200810011023.17540-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mlvdec: Don't leak open AVIOContexts on error 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" Signed-off-by: Andreas Rheinhardt --- libavformat/mlvdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 7c7ced7f76..50913fa685 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -52,6 +52,8 @@ typedef struct { uint64_t pts; } MlvContext; +static int read_close(AVFormatContext *s); + static int probe(const AVProbeData *p) { if (AV_RL32(p->buf) == MKTAG('M','L','V','I') && @@ -376,6 +378,7 @@ static int read_header(AVFormatContext *avctx) if ((vst && !vst->nb_index_entries) || (ast && !ast->nb_index_entries)) { av_log(avctx, AV_LOG_ERROR, "no index entries found\n"); + read_close(avctx); return AVERROR_INVALIDDATA; }