From patchwork Sun Mar 22 03:47:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18331 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 DB6DD44BCD9 for ; Sun, 22 Mar 2020 05:48:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C19DB68B59C; Sun, 22 Mar 2020 05:48:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20DBC68B527 for ; Sun, 22 Mar 2020 05:48:37 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id t7so7594420wrw.12 for ; Sat, 21 Mar 2020 20:48:37 -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=G6bc0odbhMkZRLwVUM/lyQ8gtcVSz0gMkiIklcXf+uI=; b=dcAm0iRmy0MPvhYwiUwYX+gxFcr7tjG05EwbNUVOpAYje79qWD130Gu0HsyGdDGsX7 XbVEPQP0Z/VEUxnOWcG2OSsOdNdK0Cno5PehzKdYGDI68FObb7dv7W6tCC6EcI/Dr77Q mxPd96dBtzu0+gyny+PPaJeD5il2jH6rPXLDaBg36Z/syCwwrwiugW1G9wVmXVg7AtJI Y8rgyAvdjwDbF00AUEKK5uGaDwKqnhqvbDQUFeOTemlwU/t34zX8z1+DVoL1XEAq8N5s /DSoZE7Vnh8EnpOX++3s10EudEdAKS47nJrAw1WsKn/wwS6Z5jpIT3/SkDa5GrJaOcsP GMxQ== 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=G6bc0odbhMkZRLwVUM/lyQ8gtcVSz0gMkiIklcXf+uI=; b=riBWzsy5gg9le3SoRuKG5oWBvNiNh8fXo5S0iMKkdynsbundW8e8wKKv3uqxlxOLSp iR0Ah6NoAJ+Asr1uRJMK8K5mN8zURuj/4xV5pzy5SK93bbZe9ZTHqic5rRKUCSs8+yEa gM++6Af1jmL2qC8W5LAOUf2thorJ/75ex0strzJiFo+WKmOtoO/UbyR5/Jgj92+vyCJ2 c/tYgb1qzvhLKKEHEsvfQObZNgMvbNnl7uxo8paUKQj7edjWvdxyyZ4LQzui85ACgKc8 n4tSo7TCnmQcOWYeAmRMGs4jFQgkKyj3hQZG4yRs0OY6UqXJMGs1+I96gSFoadPAfhub 4pvQ== X-Gm-Message-State: ANhLgQ3mDVmZeYyy+wGsYuUmz9UZRzcH3moCeBd6TbdpOKHfObzCfZYj 8LGryyt1G0yLkACXehg+KA/ilf+4 X-Google-Smtp-Source: ADFU+vt38ebaRtOs/nA8RiC+BxB6gRPJ8QEWmtAF5j09Br4Z9wGDeu/nMHolgFMT85GphYiIiE1nmw== X-Received: by 2002:adf:9bc4:: with SMTP id e4mr11771258wrc.341.1584848916326; Sat, 21 Mar 2020 20:48:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:45 +0100 Message-Id: <20200322034756.29907-10-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 10/21] avformat/brstm: Simplify cleanup after 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" by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/brstm.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/libavformat/brstm.c b/libavformat/brstm.c index ca965ed7e1..22d862ae43 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -92,7 +92,6 @@ static int read_header(AVFormatContext *s) int64_t h1offset, pos, toffset; uint32_t size, asize, start = 0; AVStream *st; - int ret = AVERROR_EOF; int loop = 0; int bfstm = !strcmp("bfstm", s->iformat->name); @@ -266,16 +265,14 @@ static int read_header(AVFormatContext *s) for (ch = 0; ch < st->codecpar->channels; ch++) { if (avio_read(s->pb, b->table + ch * 32, 32) != 32) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } avio_skip(s->pb, bfstm ? 14 : 24); } } if (size < (avio_tell(s->pb) - pos)) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } avio_skip(s->pb, size - (avio_tell(s->pb) - pos)); @@ -284,8 +281,7 @@ static int read_header(AVFormatContext *s) chunk = avio_rl32(s->pb); size = read32(s); if (size < 8) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } size -= 8; switch (chunk) { @@ -297,8 +293,7 @@ static int read_header(AVFormatContext *s) asize = b->block_count * st->codecpar->channels * 4; if (size < asize) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } if (b->adpc) { av_log(s, AV_LOG_WARNING, "skipping additional ADPC chunk\n"); @@ -306,8 +301,7 @@ static int read_header(AVFormatContext *s) } else { b->adpc = av_mallocz(asize); if (!b->adpc) { - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } if (bfstm && codec != AV_CODEC_ID_ADPCM_THP_LE) { // Big-endian BFSTMs have little-endian SEEK tables @@ -327,8 +321,7 @@ static int read_header(AVFormatContext *s) if ((start < avio_tell(s->pb)) || (!b->adpc && (codec == AV_CODEC_ID_ADPCM_THP || codec == AV_CODEC_ID_ADPCM_THP_LE))) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } avio_skip(s->pb, start - avio_tell(s->pb)); @@ -349,10 +342,7 @@ skip: } } -fail: - read_close(s); - - return ret; + return AVERROR_EOF; } static int read_packet(AVFormatContext *s, AVPacket *pkt) @@ -467,6 +457,7 @@ AVInputFormat ff_brstm_demuxer = { .read_close = read_close, .read_seek = read_seek, .extensions = "brstm", + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, }; AVInputFormat ff_bfstm_demuxer = { @@ -479,4 +470,5 @@ AVInputFormat ff_bfstm_demuxer = { .read_close = read_close, .read_seek = read_seek, .extensions = "bfstm,bcstm", + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };