From patchwork Sun Mar 22 03:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18334 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 99116449790 for ; Sun, 22 Mar 2020 05:50:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8188968B589; Sun, 22 Mar 2020 05:48:52 +0200 (EET) 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 E6E8868B549 for ; Sun, 22 Mar 2020 05:48:45 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id w10so12306168wrm.4 for ; Sat, 21 Mar 2020 20:48:45 -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=qNWkGAGbw3wwn0uzEdhGtFwKZnjFoiIv91ua0N1tYec=; b=pREdT2GN2QuflCZf6DM7Xd1YdZH+zVssZR+vlS1BBA4vI0dHvSFOs719vg06xjrrGY XRwDn0ROR0vN8p1V1s4BCJQcb+Kl1Frt6Y8wPgwSohthmQr3ybx9MrPGBQODBm7ntgyn Mh6ksV+K6RzJr/yvPMwzJQg/vYjJiu14ZuvcxEUF4dosEhKELrAPOfhl3cVNmF9QKR2q ENsclkH55tl16wIwtr1xDSoy4HMG7HgE5Pm36guXoAdosw48pMm66ZXAnN3XbzD60qAL mC7ykm5qQeoShrWbDDXAz9EzJqxIkrHe9A0x0ioLd+BeDUrnOjzlUugt3lDgyGD6eiaz zXqQ== 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=qNWkGAGbw3wwn0uzEdhGtFwKZnjFoiIv91ua0N1tYec=; b=QLPxUwY6o1mEZsggoxysh8RKoZAjL3CbNsEtvERZsdI9mIPnG4vcsIDS0Z9fZkASmX laEFjejyACrZpcsPpwwpUzQu0ZteVl4XsdvBShuzKf0Ed8CYzYoLoKVxDqVkw+z+JmKv lTdxfyEKFvKhTkcZ1G2aj938EytYoCA0hAEuIOYtvwFee0WJqJZJPJQqIQ1KqQPhG3Id GdJ7lS/2F+M8duDftfB/OHdkuiB/gzNW+A3fEzk3mvzLiYO38gHiHZRgM74L7FCtkAp5 rSDeYywl4n4f4ZskAWiWzCbLdk25RQJi6Pmo4/zeCZ0VmQlRX8rOgMJCi+TWyklYPKED IRMA== X-Gm-Message-State: ANhLgQ3jUy/mYwtlglQogUiIzyqYh00JE4vSS0rpCn/W9Oslq2Y6DG9F A2UCYx2qOoy2eBf5UfqKkMqqTf+/ X-Google-Smtp-Source: ADFU+vsB4EcT1m286R7JkS5gNkjjvA3+BS4tU+1ZbRy258lSjhWRUcTRyHm2rBdZ3cPYhualA+kf/w== X-Received: by 2002:adf:f310:: with SMTP id i16mr20632671wro.100.1584848925115; Sat, 21 Mar 2020 20:48:45 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:52 +0100 Message-Id: <20200322034756.29907-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/21] avformat/jacosubdec: Fix memleaks when queueing packet fails 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" If inserting a packet into a subtitle queue fails, said queue would leak (because jacosub_read_close() which frees the queue was not called automatically when reading the header fails); moreover, an AVBPrint leaks, too. Both these leaks have been fixed, the former by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/jacosubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 121c86d659..3e30118b8b 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) + if (!sub) { + av_bprint_finalize(&header, NULL); return AVERROR(ENOMEM); + } sub->pos = pos; merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); continue; @@ -233,7 +235,7 @@ static int jacosub_read_header(AVFormatContext *s) /* general/essential directives in the extradata */ ret = ff_bprint_to_codecpar_extradata(st->codecpar, &header); if (ret < 0) - goto fail; + return ret; /* SHIFT and TIMERES affect the whole script so packet timing can only be * done in a second pass */ @@ -244,9 +246,6 @@ static int jacosub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &jacosub->q); return 0; -fail: - jacosub_read_close(s); - return ret; } static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -272,4 +271,5 @@ AVInputFormat ff_jacosub_demuxer = { .read_packet = jacosub_read_packet, .read_seek2 = jacosub_read_seek, .read_close = jacosub_read_close, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };