From patchwork Sun Jun 14 22:36:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20360 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 6C846449042 for ; Mon, 15 Jun 2020 01:38:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B1F368B60D; Mon, 15 Jun 2020 01:38:45 +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 C613A68B5C9 for ; Mon, 15 Jun 2020 01:38:43 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id q11so15188452wrp.3 for ; Sun, 14 Jun 2020 15:38:43 -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=WBZM035juMWthU6ufPVH58QmEhvafRaHZv1D7AnvFNo=; b=QLMByg95OewkMPs8EOJ4gjJUrf6o8ZFe9G25NFHKVbJiqKgiaqr8VGFosCQheB+WLy mE463X6N22dS3dn0u6ZizohTI3cM4u8XfmEwZ6ji3/P64p4TMUwwC6bINl/Nu38/uB8G uHj3gFZEUIoakWgmVLFoWwUpMoy+Ox0RclaVG1Oz1TdlOI3Yv1dS+KA/g9zKLFbVa7Gw J1c9T27MyTrWi8kwyizOzO/8+RGW9+ybtPipAZVc4dXI0AM0DLoBmhiCRwxXoVJGpct9 qIdPPoNH0dRuMW8yOOEVrEpMqq7wrZWZda43Ct9UKF213c65rgI+PEqXv4bsF1S9ZsN1 41wQ== 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=WBZM035juMWthU6ufPVH58QmEhvafRaHZv1D7AnvFNo=; b=d4fRwJcLjQmYEfLED9T23DKByU29slAW+OCtiNbCjyc95hTpza8u08ophmRju1oUBW 2YKC603uw4RDx/8WzZPf4L8jA194wq5Bpd1JaZSOdjrnm4xfdGAkNjIxbUqYTLHa1A6/ FMtfceDlV6v/8cEWpxXu49AA7guTUrusDvYEDLu0mFEYi6ithXe+y5zuXx9+F3GJTRjg nJpDiXVKUGHifWUR6kaygHOE6nm0sm+07tk9th98TX9wkKpr7yJHFA5olkWwQfxBQ+wz EShkK95C0hL7nIsVQujaFNYZ0j4P5hLnPxzEugHYY+KahG9CHdSgjDh9kbCL59X4kD8e S5ug== X-Gm-Message-State: AOAM530qsAjqSXVNMpnzUaVEmPnzABUDSoHp3aenMnsnXjRzKAVHfQDA l4wz/I1Ea+lkXL0sbT3t2CvKebyr X-Google-Smtp-Source: ABdhPJwzvv/iS4L5Vg9p3VN+/Ly5dGg4dWZXNc6YwmQJfISVMf9Xy5QG2oWGTnXH52qpMPlUwiAs+g== X-Received: by 2002:adf:c6c5:: with SMTP id c5mr24699339wrh.13.1592174322990; Sun, 14 Jun 2020 15:38:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:38:42 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:39 +0200 Message-Id: <20200614223656.21338-9-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 09/26] avformat/jacosubdec: 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/jacosubdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 121c86d659..3414eb3938 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -188,8 +188,10 @@ static int jacosub_read_header(AVFormatContext *s) AVPacket *sub; sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); - if (!sub) - return AVERROR(ENOMEM); + if (!sub) { + ret = AVERROR(ENOMEM); + goto fail; + } sub->pos = pos; merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); continue;