From patchwork Sun Sep 20 08:06:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 22516 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 85E7C449284 for ; Sun, 20 Sep 2020 11:06:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71A0368B787; Sun, 20 Sep 2020 11:06:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09FD468B784 for ; Sun, 20 Sep 2020 11:06:53 +0300 (EEST) Date: Sun, 20 Sep 2020 08:06:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600589212; bh=xA6TlQWyGsKMy2nDHuw/kZKqb5qKMz1JBCWXzu4ts/0=; h=Date:To:From:Cc:Reply-To:Subject:From; b=lDJLzUWkf3tpBpkMZnsIVzEVXSvFfNrlJfqwm/OSGOs7qSxq8fNLAzJTMGOIiptwu uI2diYpSYjpSX//DFEvFAcbtPHHQG0RFqAaCQiLb2htnFJswbt9qz6UTxm6D/kJMuM Bdg8Lnn5D7tk/wN/OCZkm5nHhwRMAb15FVauEQ8GUhUHkhCuTbUpM6kS/0zxr167+l 9D89Il83CG2kyvN7us659PsHf+J9trIYUfjxY/Cy9c5f56ldzMmzr7YPfB/i5lrqXN 4+TlWsY7WojuM0zBQqQTP6F0sPqjXyr6CrugJoUVKaDS5fWY3HkvoHJsTHADfijU+W jrhCLJy9tnRwQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200920080528.26200-5-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 04/10] avformat/argo_brp: cleanup 'goto fail's 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_brp.c | 63 +++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index e57c20eb96..6c6e126b17 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -170,17 +170,13 @@ static int argo_brp_read_header(AVFormatContext *s) ArgoBRPStreamHeader *hdr = brp->streams + i; AVStream *st; - if (!(st = avformat_new_stream(s, NULL))) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); - if ((ret = avio_read(pb, buf, BRP_STREAM_HEADER_SIZE)) < 0) { - goto fail; - } else if (ret != BRP_STREAM_HEADER_SIZE) { - ret = AVERROR(EIO); - goto fail; - } + if ((ret = avio_read(pb, buf, BRP_STREAM_HEADER_SIZE)) < 0) + return ret; + else if (ret != BRP_STREAM_HEADER_SIZE) + return AVERROR(EIO); hdr->codec_id = AV_RL32(buf + 0); hdr->id = AV_RL32(buf + 4); @@ -194,7 +190,7 @@ static int argo_brp_read_header(AVFormatContext *s) st->codecpar->bit_rate = hdr->byte_rate * 8; if ((ret = read_extradata(s, hdr, buf, sizeof(buf))) < 0) { - goto fail; + return ret; } else if (ret > 0) { st->codecpar->codec_type = AVMEDIA_TYPE_UNKNOWN; continue; @@ -216,8 +212,7 @@ static int argo_brp_read_header(AVFormatContext *s) /* These are from 1990's games, sanity check this. */ if (bvid->width >= 65536 || bvid->height >= 65536 || bvid->depth > 24 || bvid->depth % 8 != 0) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } st->codecpar->width = bvid->width; @@ -229,8 +224,7 @@ static int argo_brp_read_header(AVFormatContext *s) st->codecpar->format = AV_PIX_FMT_RGB24; } else { avpriv_request_sample(s, "depth == %u", bvid->depth); - ret = AVERROR_PATCHWELCOME; - goto fail; + return AVERROR_PATCHWELCOME; } } else if (hdr->codec_id == BRP_CODEC_ID_BASF) { /* @@ -240,8 +234,7 @@ static int argo_brp_read_header(AVFormatContext *s) */ if (brp->basf.index >= 0) { avpriv_request_sample(s, "Multiple BASF streams"); - ret = AVERROR_PATCHWELCOME; - goto fail; + return AVERROR_PATCHWELCOME; } st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; @@ -250,7 +243,7 @@ static int argo_brp_read_header(AVFormatContext *s) ff_argo_asf_parse_file_header(&hdr->extradata.basf, buf); if ((ret = ff_argo_asf_validate_file_header(s, &hdr->extradata.basf)) < 0) - goto fail; + return ret; } else { av_assert0(0); /* Caught above, should never happen. */ @@ -271,11 +264,9 @@ static int argo_brp_read_header(AVFormatContext *s) av_assert0(brp->streams[brp->basf.index].extradata_size == ASF_FILE_HEADER_SIZE); if ((ret = avio_read(pb, buf, BRP_BLOCK_HEADER_SIZE)) < 0) - goto fail; - else if (ret != BRP_BLOCK_HEADER_SIZE) { - ret = AVERROR(EIO); - goto fail; - } + return ret; + else if (ret != BRP_BLOCK_HEADER_SIZE) + return AVERROR(EIO); blk.stream_id = AV_RL32(buf + 0); blk.start_ms = AV_RL32(buf + 4); @@ -283,42 +274,34 @@ static int argo_brp_read_header(AVFormatContext *s) if (blk.stream_id != brp->basf.index) { avpriv_request_sample(st, "first block not BASF"); - ret = AVERROR_PATCHWELCOME; - goto fail; + return AVERROR_PATCHWELCOME; } - if (blk.size < ASF_CHUNK_HEADER_SIZE) { - ret = AVERROR_INVALIDDATA; - goto fail; - } + if (blk.size < ASF_CHUNK_HEADER_SIZE) + return AVERROR_INVALIDDATA; if ((ret = avio_read(pb, buf, ASF_CHUNK_HEADER_SIZE)) < 0) - goto fail; - else if (ret != ASF_CHUNK_HEADER_SIZE) { - ret = AVERROR(EIO); - goto fail; - } + return ret; + else if (ret != ASF_CHUNK_HEADER_SIZE) + return AVERROR(EIO); ff_argo_asf_parse_chunk_header(&brp->basf.ckhdr, buf); if ((ret = ff_argo_asf_fill_stream(st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0) - goto fail; + return ret; /* Convert ms to samples. */ st->start_time = (blk.start_ms * st->codecpar->sample_rate) / 1000; if ((ret = avio_tell(s->pb)) < 0) - goto fail; + return ret; brp->basf.offset = ret; if ((ret = avio_skip(s->pb, blk.size - ASF_CHUNK_HEADER_SIZE)) < 0) - goto fail; + return ret; } return 0; - -fail: - return ret; } static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt,