From patchwork Wed Jun 7 23:48:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp804699pzb; Wed, 7 Jun 2023 16:48:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Ae31+45RFJnnhY+16g7orkXQIOdRvnq/J18MmOZBCOt6ICvRha1xgFZjO+L8Ae7luEcjy X-Received: by 2002:a17:907:160b:b0:977:d660:c5aa with SMTP id hb11-20020a170907160b00b00977d660c5aamr441222ejc.31.1686181726988; Wed, 07 Jun 2023 16:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686181726; cv=none; d=google.com; s=arc-20160816; b=zREsy1SPtO61yEMbA4oDohEmM1Y7bl1yvw2Z59xNQOri4jY+IzOi7ds7/wEMEwV+2+ SpillfJMrinC4Fq3OBFzTz46SEQbVv1VR+zDKOj33VQuYlQu1DbZQpWbh0bgVy2S6cd7 c7qb5+gAIm4076cROFYGq2dB4sothcOnz/FcrZXNon/Kt/diiRiVUOpwrwbbwzX0QQp6 TXOkdy26LgOCzB4CLszEIGq/7dxTiFWhAO1QXSv+Q5n+ZkWqnU/wGKowi2g9g/ixL+JE 6jZIWmIOwgJRJmhp2musWWRW2WaYshllEQuMqp07U3y9gH07e316lN0EQZ0L5z4jIJVD 6Eww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=pcC+pGNtNr5tr6pQYFGTZYLLUwTXTnZQg2DET+JyhgU=; b=xQVRsNdgLz8USghN4dx9x7hgDmfqIyaRT7fFP++KIo/yzfMtgLu0GPvEJoAISEXJYX tkAKhHII2+1XjvY51cNKzKQ6yvsBfT/CzQmB0NlNXhOhYi4qsMbavxhsyxaU2X3AJvx5 aNN68X0EKD6hciq2lISs3FKheVcpftUrg/MSrYV5rwYXDbMONv8P0bjNputIZrnOhkG6 a+Aqb2uvaYPXkJwpPdfuAVGS1Mx5FNRIm5C5Hk0m03B9Pc0Pud20OuARVatOBHE9wWOp id7EtdP9XKo7Qk+pTASuS3YxnNLEn7rINgc9445ttVRk0LNYqvFacbrptZWONwhssW2Z eOaA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gi37-20020a1709070ca500b0097888bd9710si1046592ejc.1006.2023.06.07.16.48.21; Wed, 07 Jun 2023 16:48:46 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BFF968BA8D; Thu, 8 Jun 2023 02:48:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-01-1.mymagenta.at (mail-01-1.mymagenta.at [80.109.253.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6314C68BF09 for ; Thu, 8 Jun 2023 02:48:12 +0300 (EEST) Received: from [192.168.232.135] (helo=ren-mail-psmtp-mg01.) by mail-01.mymagenta.at with esmtp (Exim 4.93) (envelope-from ) id 1q72st-002Lhk-6I for ffmpeg-devel@ffmpeg.org; Thu, 08 Jun 2023 01:48:11 +0200 Received: from localhost ([84.115.40.24]) by ren-mail-psmtp-mg01. with ESMTP id 72ssqZt77OG5Z72ssqFVUG; Thu, 08 Jun 2023 01:48:10 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 84.115.40.24 X-CNFS-Analysis: v=2.4 cv=KJo5sHJo c=1 sm=1 tr=0 ts=6481173a a=4thelYDX6rwh+ygQwvsI+Q==:117 a=4thelYDX6rwh+ygQwvsI+Q==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=pcnzj7UaukMZLrmIrvkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 8 Jun 2023 01:48:10 +0200 Message-Id: <20230607234810.9283-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230607234810.9283-1-michael@niedermayer.cc> References: <20230607234810.9283-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4xfGXIrv4BwF7vogd5cQX1HSZNlq9cmsHumqABhEtbusIsqCDSOU67mrkY7FpTtYQjhPVwCovTylr9ZWyi9H2+BsPiQIGaQ3JgAlN7gVz5I16+vfQ6FTSr zRF9zTjWK2O7DWvTt4s7ZHFkfcCZ6VDXWK68xyLCHRrqrMzGkgiiSajtYyYx59DejIYiiG/0i7As2A== Subject: [FFmpeg-devel] [PATCH 2/2] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LvoV8HLIKeMv 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; }