From patchwork Sun Jun 14 22:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20369 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 EDA444491DC for ; Mon, 15 Jun 2020 01:39:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D983F68B6C3; Mon, 15 Jun 2020 01:39:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0F6D68B6C2 for ; Mon, 15 Jun 2020 01:39:21 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id x6so15130650wrm.13 for ; Sun, 14 Jun 2020 15:39:21 -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=E2MGWG4NsPkI2FXsfgw6OstKnJIH/2DAM9XHVBkA4g0=; b=LjUrHb7Zljmr/7Sr24cz4CVyFABfRvQmdh9sbKKIqFqdBTiFTcc2NBf5n1L3sddeQT T+DyGJkZJpN+rc21qh0H96CMvBxGAmev4e/oLWkU3Q5cwcumOvxviEmgDUYq7sxhttyE 5Y1H5Ypk88HO7NyKjMzm2p76WyumSmEI4r9HK56wfxjRyC2M9HhwiZ55Yh3dYhoakhj8 7x1Z6fr19EjynpwL9CLDkhKGMBptqMH8QrzGL0JJBgjHuQIj9m2Pl0E4tG6llO9Hx0HW nDREBP7terz3UwPc6qwWhUgHtjJFmAFq61FkRzaiDKGI+7AfW4aSxTN2oLolN1QrbIii yTOQ== 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=E2MGWG4NsPkI2FXsfgw6OstKnJIH/2DAM9XHVBkA4g0=; b=LEyiW+HaOAUy4kQrm/VvF2vbIUi1ksI6UZJaRfaeMG7GLCkhNrUM6/q9EzIbIzSDXE u7teNd+/61gaJhmr3z3vc0Q5hRBuBtWYCxKTk/WebA1kewJr5hGZM3UzCdzBUCJ6jddu GyHkWPG20/gMzWJmC+g7j6IxhRoAUsHJGxE79t+oCLEMl52QbTbawV9Aat0qZMXPNSk0 2ae7PA4Z3TPrqigBkAky73ls5e3liEDyYCvl39vEEjJLgoIHlxILqwjeUcmj4PKCpec1 8+FZzMdo72dVr+eFEp1TuY4kzOm5DVJFDQXCXUzfGRbGWXRBQoeR5ZRtVI4HSIRGyRf4 7miA== X-Gm-Message-State: AOAM530ZlXzbu8TuvBAPSrXf0mDG8xyIy4EQv9kD2VD5vYSuOtCUlYrj yPhsgw4AmQIR9dvB88ncKVlqCH4q X-Google-Smtp-Source: ABdhPJx1qhCkNtePP8MAQU96yNY2p2LsgYCwtEV2KDnMrKpraALGuNkzGXVDhkxkol0M1CGCx0111Q== X-Received: by 2002:a5d:4dc9:: with SMTP id f9mr25192800wru.407.1592174361080; Sun, 14 Jun 2020 15:39:21 -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.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:39:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:48 +0200 Message-Id: <20200614223656.21338-18-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 18/26] avformat/stldec: 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/stldec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/stldec.c b/libavformat/stldec.c index d6e0713f8c..fb67407ac5 100644 --- a/libavformat/stldec.c +++ b/libavformat/stldec.c @@ -97,8 +97,10 @@ static int stl_read_header(AVFormatContext *s) if (pts_start != AV_NOPTS_VALUE) { AVPacket *sub; sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0); - if (!sub) + if (!sub) { + ff_subtitles_queue_clean(&stl->q); return AVERROR(ENOMEM); + } sub->pos = pos; sub->pts = pts_start; sub->duration = duration;