From patchwork Tue Dec 10 21:59:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16710 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 1FA0744A835 for ; Wed, 11 Dec 2019 00:00:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EBF968B098; Wed, 11 Dec 2019 00:00:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57AAD68B13F for ; Wed, 11 Dec 2019 00:00:30 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p17so526611wmb.0 for ; Tue, 10 Dec 2019 14:00:30 -0800 (PST) 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=DityfnCPoLY66Igv3J7YupoW5U+kLG/Tv84nOUiIrao=; b=VzutUQc0J/d1A5yKSBlXZo247q9OufP0kTSQeGTshMCrsXr/RooQ26aGy76YcGQjhq L8lX1E5R6djhMhVOcMnxmsiSZSE0mvm3OlKBboZ0XRVEGyuv57FIdhX5x3mXNWbKubQE lcOkYhgkII8PmlPKtQbtbo4hMz7NXqE1bAXcT7j0IIv8oTifus9Qt7SQuHd9ybKElRBh tpwkKWqTyggbKBeDRI7AfocVFluKnSKDFpdzimCC/mVNCBv3QDMCjJAhSO/Mr2TS/dFH IYGmlz4sC5e60TBErT5xegKiM4Gn1oonfFc+JzUNkpnSbRC0mo9+0+gHZOQayAHfqK5C pj1Q== 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=DityfnCPoLY66Igv3J7YupoW5U+kLG/Tv84nOUiIrao=; b=rWVfxbVnjjnySX1FGHt2QFxFS4W3Cdx4UOI7WkTvklx6xF6w1ySPqUx08ui1Rd27Z0 0nBefkYy4VgsBNYgxrBJZl1cVhF0m/nuQfcDoEtYUEjskhL0d+lvoMeGa4HJjkUX1P0S 8gSYaOXX4Rlw1tWWfqh9jAqoK0OL49xiKG/IOibp+x8IMtrLuBKd+rtg5dDYpEFP20yK A3mkWHYXcPAjU9JiZuxyMH4XhBPlqKpB76ZkT4RGzjkJiu5TqE6rNpn0r+aysqX2jph6 wyASEQWpLGBt6ggZVxXWcKfepKsf6Flsji1t6UACzOgRxzlHGW6Cn9wgXFbN4htxZHmE PKxA== X-Gm-Message-State: APjAAAWw5LMnipwF540UFV9ltbi+y+tAjGlSCFf1EnY+toxIYETqgMWR JLBQ0hK3rblJZKV1kIT1EsZUUy54 X-Google-Smtp-Source: APXvYqyqTF8skeSuRfaHlUmp5HvbHQMw0N6z71003tnRnSbysneaXgtNZuQvLrNaV9cM+5Tk8+P0og== X-Received: by 2002:a7b:c7cc:: with SMTP id z12mr7710478wmk.115.1576015229651; Tue, 10 Dec 2019 14:00:29 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n129sm3876381wmb.1.2019.12.10.14.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 14:00:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:59:49 +0100 Message-Id: <20191210215955.11178-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> References: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/11] avformat/apngdec: Remove goto fail that does nothing 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" Signed-off-by: Andreas Rheinhardt --- libavformat/apngdec.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 6c58fd9d04..f66432f2d6 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -151,17 +151,17 @@ static int apng_read_header(AVFormatContext *s) uint32_t len, tag; AVStream *st; int acTL_found = 0; - int64_t ret = AVERROR_INVALIDDATA; + int64_t ret; /* verify PNGSIG */ if (avio_rb64(pb) != PNGSIG) - return ret; + return AVERROR_INVALIDDATA; /* parse IHDR (must be first chunk) */ len = avio_rb32(pb); tag = avio_rl32(pb); if (len != 13 || tag != MKTAG('I', 'H', 'D', 'R')) - return ret; + return AVERROR_INVALIDDATA; st = avformat_new_stream(s, NULL); if (!st) @@ -186,18 +186,16 @@ static int apng_read_header(AVFormatContext *s) AV_WB32(st->codecpar->extradata+8, st->codecpar->width); AV_WB32(st->codecpar->extradata+12, st->codecpar->height); if ((ret = avio_read(pb, st->codecpar->extradata+16, 9)) < 0) - goto fail; + return ret; while (!avio_feof(pb)) { if (acTL_found && ctx->num_play != 1) { int64_t size = avio_size(pb); int64_t offset = avio_tell(pb); if (size < 0) { - ret = size; - goto fail; + return size; } else if (offset < 0) { - ret = offset; - goto fail; + return offset; } else if ((ret = ffio_ensure_seekback(pb, size - offset)) < 0) { av_log(s, AV_LOG_WARNING, "Could not ensure seekback, will not loop\n"); ctx->num_play = 1; @@ -205,12 +203,11 @@ static int apng_read_header(AVFormatContext *s) } if ((ctx->num_play == 1 || !acTL_found) && ((ret = ffio_ensure_seekback(pb, 4 /* len */ + 4 /* tag */)) < 0)) - goto fail; + return ret; len = avio_rb32(pb); if (len > 0x7fffffff) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } tag = avio_rl32(pb); @@ -218,7 +215,7 @@ static int apng_read_header(AVFormatContext *s) case MKTAG('a', 'c', 'T', 'L'): if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0 || (ret = append_extradata(st->codecpar, pb, len + 12)) < 0) - goto fail; + return ret; acTL_found = 1; ctx->num_frames = AV_RB32(st->codecpar->extradata + ret + 8); ctx->num_play = AV_RB32(st->codecpar->extradata + ret + 12); @@ -227,23 +224,19 @@ static int apng_read_header(AVFormatContext *s) break; case MKTAG('f', 'c', 'T', 'L'): if (!acTL_found) { - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0) - goto fail; + return ret; return 0; default: if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0 || (ret = append_extradata(st->codecpar, pb, len + 12)) < 0) - goto fail; + return ret; } } return AVERROR_EOF; - -fail: - return ret; } static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket *pkt)