From patchwork Sun Jan 12 21:56:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17311 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 2582444B190 for ; Mon, 13 Jan 2020 00:03:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0274068B0C7; Mon, 13 Jan 2020 00:03:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E46B68B0C5 for ; Mon, 13 Jan 2020 00:03:13 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id c14so6720411wrn.7 for ; Sun, 12 Jan 2020 14:03:13 -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=4jMo+26FxOetSGNha8kISRsLU6/0zBLwySs3PQMojz4=; b=ri7YCoU2cZjLvSSQ+acBG3aPa0JqnVrgtS7k19jYvvo56KSNjChpvc3VyBPukyKSR0 LNYIqoleHgjFov6k8XqaC9l72f2rBobaiznjvrrXPZeknzA4GJAk3T3HgB4QJWbBmoz7 batmpAVC6x2QUbx9oPjCvmlUQfgsfd/w3SIijWOE16ICAn665TDgZKImpuPFI+mJ0Ngc aAa4uLKk0DuXlJh7vkKO0ab0pNS0dNt+P98o8DHeGbbCoEjVoTeY8wi6oIoXg2JdtLqe YcLEMX5cPVGMyr8rZuakYoqOzRfrViN0GwY9YhNMfhVHygI5+fuYdCtq/S1VazuDOQGr 2tLw== 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=4jMo+26FxOetSGNha8kISRsLU6/0zBLwySs3PQMojz4=; b=NYfdNyGbFrepSMsKhanBenl2mJIIJYjRryJmkFhWjh/K/B8ArpZg+ygYCBvgi2BPUh J8JQr3X1bgdGhlb/4MrTDUc1c8lkIwNxoa8I8f+eRArk0ux+jfJ0BKJXq29qkUOcEnyp D2fLlRAsucUFSTxFYSzEgiJnnwojYZc9soXHqU2q41IYI/hO+K+l6XBkIym3BBppBYdD othTnc8BtJYJHO61gxiNllfJrbOabziE/U5hzD4Z2D/19QLGmeewuZiBKBwpb3oaWwDy 5uOEu0PEuxJUc0Sp1j/npv8F5//h7SdgyGoeLBQmUWqAiDJUfSSg0rqABWtU/pbcg7PC BXSA== X-Gm-Message-State: APjAAAW+oRI72VGkZHVCcdSHM6rP96FWwgdmQre4RRLHoA/3k04tyopL Cs+jM8mg7uH0KSn365St3hr+vrig X-Google-Smtp-Source: APXvYqwrlxhz7WTi2tOxq4CnrchydQOPZPHJwR220/ESoE7h2josZo00PWdsJ5oEBe0uep5+VO9fFA== X-Received: by 2002:adf:fd07:: with SMTP id e7mr14660993wrr.21.1578866592453; Sun, 12 Jan 2020 14:03:12 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id c4sm11763741wml.7.2020.01.12.14.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 14:03:12 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jan 2020 22:56:51 +0100 Message-Id: <20200112215651.1258-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200112215651.1258-1-andreas.rheinhardt@gmail.com> References: <20200112215651.1258-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] 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 | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index e9c317efbf..13b66d700c 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) @@ -193,11 +193,9 @@ static int apng_read_header(AVFormatContext *s) 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,7 +203,7 @@ 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); tag = avio_rl32(pb); @@ -213,7 +211,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 + 12ULL)) < 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); @@ -222,21 +220,17 @@ static int apng_read_header(AVFormatContext *s) break; case MKTAG('f', 'c', 'T', 'L'): if (!acTL_found || len != 26) { - 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 + 12ULL)) < 0) - goto fail; + return ret; } } - -fail: - return ret; } static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket *pkt)