From patchwork Thu Jun 8 14:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 42013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp438662pzb; Thu, 8 Jun 2023 07:27:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4foCbaodaBy5S6Fy7eWgGqgr8FdPCJjQuP6tx0/IDrbHR0Bpjb6HF/h70eOlTBcaOlmTil X-Received: by 2002:a17:906:6a20:b0:96f:c988:941 with SMTP id qw32-20020a1709066a2000b0096fc9880941mr10372485ejc.15.1686234439626; Thu, 08 Jun 2023 07:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686234439; cv=none; d=google.com; s=arc-20160816; b=dyLZ9clxUg1coA6mQFuN7tRWR0amxo+dkoCr0U1JBU2XNKeki75tjs6qotYD1vwfb/ q67ZW7++VdXWotQnssFAJIvb4Uv3aC6XnD+VPx+ymApomOAgtxyqc27SzmzJRKFLdBbk 5LTUTRYwpHpNl06KYbLNcHmLU+QRqtkBhscdeVvT4BTzgeS3auH3PoX6by2jBxPGKICw zSwE2RnYfdPKhKLGfELso0OvmYfclaVUJPSBSlzZZuDcaE2xR3drg1IPZIEA1aOcr6ld ZPwg143AoBeAMAHqRWIj92q21VFK8G/P9J6RTS+Vrf/auNGZ4z/Paitlmn5VpAcI6MAp uC5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=RShdlyggciQJhgH26SivTIuQh+2CZ9ccJxG78I7XDsQ=; b=eC9ouje2zuylOqbkG5jlglY0jcsNVVhP2eltyK054zuhHAhfcyksdm3ZkBQNCkb0q9 PViLG6gTxPk5q/LOPsG0BoO5RzDkmsDe+FAjIpCkloDV53X+yxcmXXEcQBDeKAa6vjgQ 7ySNM0o3z/v9OBTipKS4HaviCKAZ0JRyIDHUoK2yqxg6JMX9wIVB7SJkOG7RbqRYpvJx S0VvW2R8kRafY0cU0LeRmfPCiBhqehBuz8p4BvHWlTilmKqgF7TwPxDHL6mSgB0p69Ti CiH2Kx31eqSpp+vj0lOZzN7zrkf+SdwS9gP1+hUXoNL/rF2LLQFkEpEHNUYSptyvsu+5 WGTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=dXiG3lRZ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11-20020a17090633cb00b00977e918b23fsi868365eja.449.2023.06.08.07.27.19; Thu, 08 Jun 2023 07:27:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=dXiG3lRZ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FAFA68A5D5; Thu, 8 Jun 2023 17:26:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42A2B68C2EE for ; Thu, 8 Jun 2023 17:26:42 +0300 (EEST) Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-bad035c71bfso56766276.0 for ; Thu, 08 Jun 2023 07:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686234401; x=1688826401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v25hFjFTzwmi1f1DpHj4jeZvUbkBZwQsrUUFPOaJDh8=; b=dXiG3lRZs5a8q/l/MPAm8cQXOgRjmV9CsYgOM1+1G9QZb/YvEO15wvAh11Jt4QCQlm F5hNN0xhYpTv2CuJDFCKT+WpzDGlNZrTALRCPE1Q2AfwujVFK7kxkwfg7ygIsoQR2BIj Thx60neTfR4Sln1Oq5q7fynlL31Kfpw2qQG6QULoHTVBg1VR//f98UQYCLSiacJbAtuG nv37MYXsBIQB92xu7Qd8nfeFhEcTm5rSXA0Psaha6xcCFYRX92K03FiYFaPJRoYZMinl P7DyeFypKA7QcoIHyq+qVAfezjq9m20kCzEBrtGmluOCYjqlkeEhNnSelS+34Y6qJZ2N eMXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686234401; x=1688826401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v25hFjFTzwmi1f1DpHj4jeZvUbkBZwQsrUUFPOaJDh8=; b=kuqw/qeXxgj+ytyHMXdb+aU43R+nwqgpPr/NS9Dk2vAvd/KPwT7J+5Sp65et2zN3e/ orUzvaomTiSkIv3XxS6eGZICK2iSGn5sapIMoAvTfooC6Mfsk5QbT/X7IuDBgrZ5C/ky EXajo+BofiXY3DPCwY8lNhvzBDWWw/5SsynqtTU6x2B5CNzu1/x90tGMhWUESnEKmkBn IXWkYPV3LTKwNkfxki+tws6+eFJoCs3ukPMmQHVk/oL3527WkIYXDRdKFY9n73sDKRc7 QiqklB6OPTwzsaT0ZrnfjgFfOrn61fJbv1dvuqvtiXLRtsAf9f6slZySfwUgQxwIj4PK QPVA== X-Gm-Message-State: AC+VfDzOAdqgDkIrVKbzFhkNQZ9HAOsPlztg6P6Sr1Ck/RdXc0wXmqaQ fKvsgKAxdu9T5RUMs6/Qnn56B8w+eh8= X-Received: by 2002:a81:78cf:0:b0:565:a490:b417 with SMTP id t198-20020a8178cf000000b00565a490b417mr4245694ywc.0.1686234400908; Thu, 08 Jun 2023 07:26:40 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id b206-20020a0dd9d7000000b0056943d9cf8fsm414589ywe.9.2023.06.08.07.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 07:26:40 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Jun 2023 10:26:35 -0400 Message-Id: <20230608142637.45033-4-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608142637.45033-1-leo.izen@gmail.com> References: <20230608142637.45033-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/jpegxl_probe: Forward error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Michael Niedermayer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dPq6zkutgIrf From: Michael Niedermayer Signed-off-by: Michael Niedermayer --- libavformat/jpegxl_probe.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index e15e9eee49..88492cb772 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -261,8 +261,8 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid if (get_bits_long(gb, 16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) return -1; - if (jpegxl_read_size_header(gb) < 0 && validate_level) - return -1; + if ((ret = jpegxl_read_size_header(gb)) < 0 && validate_level) + return ret; all_default = get_bits1(gb); if (!all_default) @@ -281,8 +281,9 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid /* preview header */ if (get_bits1(gb)) { - if (jpegxl_read_preview_header(gb) < 0) - return -1; + ret = jpegxl_read_preview_header(gb); + if (ret < 0) + return ret; } /* animation header */ @@ -308,8 +309,9 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid if (num_extra_channels > 4 && validate_level) return -1; for (uint32_t i = 0; i < num_extra_channels; i++) { - if (jpegxl_read_extra_channel_info(gb, validate_level) < 0) - return -1; + ret = jpegxl_read_extra_channel_info(gb, validate_level); + if (ret < 0) + return ret; if (get_bits_left(gb) < 1) return AVERROR_INVALIDDATA; }