From patchwork Sun Jun 14 22:36: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: 20372 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 096AE44A382 for ; Mon, 15 Jun 2020 01:40:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E76D868B6DA; Mon, 15 Jun 2020 01:40:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89C1F68B6D9 for ; Mon, 15 Jun 2020 01:40:13 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id g10so12779375wmh.4 for ; Sun, 14 Jun 2020 15:40:13 -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=aD7Z0UpOr4n+nxnFmS+W6eh8QJRRSvKHnb7sL/+oGGo=; b=cNk5pvlx7qQ6chij4YFySbrNwXx0s2asJIOco9qoocNb46GE4QmLTnmwqiUag7hq/Y daS7AeMECbH3odscevW/lh1fE5WvP+/Frr9x/mJP+glUqGLWZyK3zLmyesf8D1ygIHG9 gMW+cGibMF9cK7HWygBN9eltmlHe4hg/L67VxqcVJDaHEW9PYqOu577srunWeaIk5KBO PWI6uSza8KhSfAAvD3nrlkAVadXTXTHJ1j/eOvJnqlBvqJ6a/ASfVvKah8aIjqFwxVW7 knMrVSG22U+mY8Mty2rgaT0IJYY8FKFP6FM2b74m3PFjIOc17D3LnlXAtdqsOFMFVy9N V1Lg== 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=aD7Z0UpOr4n+nxnFmS+W6eh8QJRRSvKHnb7sL/+oGGo=; b=c+jhDw1lSH2iTj45ihYk4mabP+/cAIcleRk/bJj9qCCfBEJ53nIdVzFw+9Z6f2TjqM 4EDkUq+4CaNTlxrsa3QdXGudY4oG24C76EB9qYhXJyrBM8CnxdLTE5zeIp9wc9mQL50H NsrhZRwMqEehXZvSfv2STUokrHApN3bFHsTNFk8HvPrdKRSKFWKIwIcnY8VbYIeJtCUd plIWzRKLCZseCI5aX85ytXLe7wHlcZdRWCh6vwPDNSncQZWr8qk/oxhLBs8xL0swrROG QZUo5s7rLfUxjm/6IVWvo8NvoacAsANo2K99NltgGpo9WSao0kiHZCzT254tc4WzUWPl Lihg== X-Gm-Message-State: AOAM5300nf4fe2zPzFBatVats5fUTEnXttWu5JKS+88OKWJ0QG68SROT iGY6ZpdfWeh3nxfIF0cTwYifPdJz X-Google-Smtp-Source: ABdhPJxqm8wVVmixYH/xegKLmmK17HTdTV2yHQ8ABU+0/ZDBh9E/4lm/I9aUk4kb6Cioqj9QiKcu1g== X-Received: by 2002:a7b:c043:: with SMTP id u3mr10549422wmc.185.1592174412781; Sun, 14 Jun 2020 15:40:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id z8sm21491034wru.33.2020.06.14.15.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:40:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:51 +0200 Message-Id: <20200614223656.21338-21-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/26] avformat/tedcaptionsdec: Fix memleak 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" The already parsed subtitles (contained in an FFDemuxSubtitlesQueue) would leak if allocating the AVStream for the subtitles fails. Signed-off-by: Andreas Rheinhardt --- libavformat/tedcaptionsdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c index 5572bfd931..3255819e77 100644 --- a/libavformat/tedcaptionsdec.c +++ b/libavformat/tedcaptionsdec.c @@ -275,10 +275,13 @@ static int parse_file(AVIOContext *pb, FFDemuxSubtitlesQueue *subs) static av_cold int tedcaptions_read_header(AVFormatContext *avf) { TEDCaptionsDemuxer *tc = avf->priv_data; - AVStream *st; + AVStream *st = avformat_new_stream(avf, NULL); int ret, i; AVPacket *last; + if (!st) + return AVERROR(ENOMEM); + ret = parse_file(avf->pb, &tc->subs); if (ret < 0) { if (ret == AVERROR_INVALIDDATA) @@ -292,9 +295,6 @@ static av_cold int tedcaptions_read_header(AVFormatContext *avf) tc->subs.subs[i].pts += tc->start_time; last = &tc->subs.subs[tc->subs.nb_subs - 1]; - st = avformat_new_stream(avf, NULL); - if (!st) - return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_TEXT; avpriv_set_pts_info(st, 64, 1, 1000);