From patchwork Sun Jun 14 22:36:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20399 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2150307ybm; Sun, 14 Jun 2020 15:40:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwi+FJl15HQ8uSDIG4CN5GK9PjJ4DotaGO+Y7BWh/bxqQXsmKdwS3z4+PE0SEwDm9JsZlZ X-Received: by 2002:adf:82cf:: with SMTP id 73mr24585231wrc.382.1592174417858; Sun, 14 Jun 2020 15:40:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592174417; cv=none; d=google.com; s=arc-20160816; b=vXE8sZ4r9BYRgo6LMjLkzHzuKOtLHrbtfZ+JD5Srcvn5rhDot8AajNRGrKs/xoG1BN WJwdBKd6vMyJ90Qwxo60a0UCtp47K+yTtcExB56ElNyc9FzFqUSvsqJksZ2SHkaEe0U1 lQEGkLRGkg+E13ya+66VDSw6xuRH8OzHYuWRIKK5MlV66emPcKP6HNHPMmV7ncOHRaOg Gsn97bj+0aNHl/7WDwZYvFPtnX4KfN/JfUhHZ2HGC9Ma26qIReNRh1L2W8SAIkniX9CD WoXG3mD6iJ8Uzwi8cm2hSAfoE05xaLHLEVWrEwlWyV9TTDFGY3y1n7mXa576xGju4TYr 7Gdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=B4GTZ+dTKX+r0tiNUlmb/gQOvmkDY4aAgG6fJkmeGZk=; b=CDEmIZbQkr3MSrBgcUNAV6U5/FkyRzr3nXFzCNo01U/Dj+VlgTgXq1iLGPbfQdJaga ZfqNZ8/yHS0LDJe8bjH12mdz52VBFj8QhR/2JOADXIFajLFX2UplbSvydZGe73R92Nv4 0CGKVnr0uvFZ5vek69WmsE0k0H8qKLzQ8eL4vKPo3uFdmuTHVhOPLScE8G8kw/+HXVX+ QBN8iZjsXL1LSnTsvjtaw6sl9LrOi1XVjP0l72cDxdnK7WL5mjWrljwdt8FgQVr6Us5m hEVA9CQOqPjdjIz/rZGOfp2WbgFZbnUoRW4xabBC+AyUeDjnP6ps9/soRo/zG47EibR2 AlzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IRnrUHrl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d7si13331815wrr.486.2020.06.14.15.40.17; Sun, 14 Jun 2020 15:40:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IRnrUHrl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0D1368B655; Mon, 15 Jun 2020 01:39:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DB3E68B553 for ; Mon, 15 Jun 2020 01:39:11 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j10so15164429wrw.8 for ; Sun, 14 Jun 2020 15:39:11 -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=4AR+qtR9nTLwdjudsFlNp42CBdqRIVyQMKH4Mz2JTh0=; b=IRnrUHrlyvZDZsNNT4Cd49Plf/tFWZRKnvrvFOuvv/ZFwKP6MbqCpw0cU+ufv+TU0R F5C8Xf0b5I+54/0KgPMSq9aw3K7ozUy/swbV5zohk9a9FFP3va1yzBwc67PGRIAgRGj6 /cZm/x2/5FfgjybRyeNmwel0fnS7wA3B+MrPLAR8N1f3C4ZYeZ2at4NHfUbjvhopKDJY 0HYr6hbppdKGFAHHbO2BdVkWg+v12ejKWPTmRCIZZTHxMRd5UfqD8Eu33Qq1Jm7DrY5W vjjUiRVL7wvX8MGrpJxBG4C5rGanMSCKzqNuzySJHYIN35pznQOx/P7X6XANxlvzjDMv QiBg== 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=4AR+qtR9nTLwdjudsFlNp42CBdqRIVyQMKH4Mz2JTh0=; b=jepTUJDe9VbaQdsDiAgCzbG3SPiwliDZGHwvNN6KH0WymNMjMVu6fQZCZ2w7easFJF t/Xnx9e3sKjQjGuH9dclD2IaJutyC3oJB41XlwSaqhBGHggH6KgUJSfy+njZMNn9uzIi J3MNhrv5hqFOnkS3ePUMD/lbtnpOWT/a0+NVNsSWat4Ou4hTndTqJhacrlhmzTtWj0Ds YUMQR9UqkUTCWe+CCMg8H8jpZh6eXZWXts0DwJWdTUo76ZHdJAXjvurZENiSNchgLB4t vT7GgbDdpU1ICUHrrax5uh05wPLSk7OLqpiLkpB5rWDS25VHRJxDA1WH4zQDVEUH6ytn Fk6g== X-Gm-Message-State: AOAM532R42w4Uy+KFfflNx0chN0Y7qQUYwqq7KfSANuJevFAWAm3CYE/ pMBN6lW52rLU28q1wB0N0L9YfjFX X-Received: by 2002:adf:f582:: with SMTP id f2mr27813993wro.204.1592174350226; Sun, 14 Jun 2020 15:39:10 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:39:09 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:44 +0200 Message-Id: <20200614223656.21338-14-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 14/26] avformat/pjsdec: 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" X-TUID: hofgjRDvff9X Content-Length: 1532 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/pjsdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c index 8a5cc04f84..e30c23d830 100644 --- a/libavformat/pjsdec.c +++ b/libavformat/pjsdec.c @@ -94,8 +94,10 @@ static int pjs_read_header(AVFormatContext *s) p[strcspn(p, "\"")] = 0; sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0); - if (!sub) + if (!sub) { + ff_subtitles_queue_clean(&pjs->q); return AVERROR(ENOMEM); + } sub->pos = pos; sub->pts = pts_start; sub->duration = duration;