From patchwork Sun Jun 14 22:36:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20358 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 DACCF449042 for ; Mon, 15 Jun 2020 01:38:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE1F868B5EA; Mon, 15 Jun 2020 01:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A548F68B2E0 for ; Mon, 15 Jun 2020 01:38:41 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id e1so15192571wrt.5 for ; Sun, 14 Jun 2020 15:38: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=KRlutKN36HrJoIcOYHbJ5OmJLR95vlFVPiawMIlTtFU=; b=jeTGqTbrEr3fLdp9LP3IVlznDYEduZFdfQkA1CUYx06GjYalK4TmCyydVbDlmwiAXz R+co40AHkzaz3VRc8oxOlGNmQHmoEHmQhmHRfDKaDDPv8stTbVqHEFTSN/nkJNojpkLY WTAtE5T1Qdv5NUp6ZDojxFfjcXNU1hlNnMox/NlNKc2yh+NVVMNixVuPbatsc8Sd3esx ZXKM2ddQ8zBlcKYdNgfPaktl8ARLnfODQAUO1r+ie1eDaZAOpUKpwL9iRjdnuLLD0mtK UpR+/Zk5MB/ZVs2377pSTjDLeaxC4k0tNX2WEjLrOb0OAeutP7ADlfqSXWiOb1vzRTSY fCug== 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=KRlutKN36HrJoIcOYHbJ5OmJLR95vlFVPiawMIlTtFU=; b=aBqaCw3+ItsEVFv2WbuQb4uXNT8GbRvBpJWKcXW7Sul6t1gOY0xNDc1+SxYc0zpjLS JwR/wbg1gC4Yq3EbEWqang8UQk7+yAO+jYZU02S1BKkxjDRzQxZJniPMSF/7idUKP9K9 YbzZ9vp7hl+eITlIYw2mNTpfZ5aCaX6/Nkb/QLrUFUUERGwhXzAc6SF6aAfLKF75cgYH gukcoM9g6tqnvwLMw7jGrnETCDreS7LEk/x8liPAvy0yyIGYQwUiNnweVJTKtuWVkrlO CaGGF0bnBB3VjZnz0UFycaGdaNFjZwxwTKHDv7dqQxBS9t8rFFZlMUzit6cS4pmwKhsi c9vg== X-Gm-Message-State: AOAM5311IBPbqXOonrgLHXHh9gRaqxUQ4wlE3/dQZ1FrLj7+5wjM/ftD VkwHaXgQCtQILiA0Wt0M6NhqcEfG X-Google-Smtp-Source: ABdhPJwABMs37qHoNd+zPfXYPN8GIP+3LS5xVH0XjcAk2HTF39+oOGgSLIYjgFk3qQ7kqPoYysdWjA== X-Received: by 2002:adf:b198:: with SMTP id q24mr25817657wra.368.1592174320880; Sun, 14 Jun 2020 15:38:40 -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.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:38:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:37 +0200 Message-Id: <20200614223656.21338-7-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 07/26] avformat/aqtitledec: 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 an error happened upon reading a subsequent subtitle. Signed-off-by: Andreas Rheinhardt --- libavformat/aqtitledec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c index 8cc82a8f39..81630d73b0 100644 --- a/libavformat/aqtitledec.c +++ b/libavformat/aqtitledec.c @@ -81,11 +81,11 @@ static int aqt_read_header(AVFormatContext *s) if (!new_event) { sub = ff_subtitles_queue_insert(&aqt->q, "\n", 1, 1); if (!sub) - return AVERROR(ENOMEM); + goto fail; } sub = ff_subtitles_queue_insert(&aqt->q, line, strlen(line), !new_event); if (!sub) - return AVERROR(ENOMEM); + goto fail; if (new_event) { sub->pts = frame; sub->duration = -1; @@ -97,6 +97,9 @@ static int aqt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &aqt->q); return 0; +fail: + ff_subtitles_queue_clean(&aqt->q); + return AVERROR(ENOMEM); } static int aqt_read_packet(AVFormatContext *s, AVPacket *pkt)