From patchwork Mon May 16 01:16:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35785 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1323678pzb; Sun, 15 May 2022 18:16:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhS4P8t61Euky5/p0f02Q6HtgmsKbddg98/mFgZpJaMunTFCtjQTusaEsgqF6NDuCJoMma X-Received: by 2002:a05:6402:3485:b0:427:cde4:2097 with SMTP id v5-20020a056402348500b00427cde42097mr10804217edc.264.1652663779482; Sun, 15 May 2022 18:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652663779; cv=none; d=google.com; s=arc-20160816; b=jSOMf4Y3rC9V1Vn4i2SX9yWvcEofkvezTxpjw+dcxpzapYscBFHu8sGiyp9W8Vkx4L s2VVeSvBwLgDuVEhZ9a67xEQfXKzTLl6JouqRfmsWzp0+ydNOszQr+m3jT4SX1vVMwoQ 7Q8NBjMuTq89g35+XD1KBfOjbNY7Gzo/DZ9+wbBP3GIRgCodY2EhE/eBucoCT7EpMJ8y 3k0uflllrUYAdiDb2a7aCVfC7usBoVpoGnGxntkr/2o+Ly2lX+sgvbH0e9skbXcOqskH 8UQkdyFHzsjAR1RTG8HVYRl+a0TP/lcq/MkKXBu23xFBcYUMJ0qRAbHKEHiGLdCuMGCZ J+9w== 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:message-id:date:to:from:delivered-to; bh=uHHP4Xt06d+JMdutGyXvAI1FO8l3sMalTMYtracT2Tk=; b=K3wgBURG0LbwyLA5ggX88b4lJUOAevT6cePqrkpm0RPhJcfzlQMSYGdsK1KXY3BbaO G/HdbOr4E3pD3ZqxinTcZimSWrWA+KLX5l+cZXBO0Bfc8YfAelVbfHbcefwpordo+1FF wX91V0fHVxk98sCvdyk6LPF2ibh/qRWUTuzpoTZTX1o5cLE7CspO5M7sDfxjpts6id/+ W545PMjMuRwDflSlrMyND3HlKdUheVXadm8ahyExRCrDF11yRWfpnI+JfQesJ55/xrJZ iFa29OOVcThgsY7av1RPEwRzHhk6dskOXIpHO+/Jjs8+eY0V/5DGAb2v7iISU7JZzQZK /m0w== 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 cr19-20020a170906d55300b006e8c745f302si8882756ejc.314.2022.05.15.18.16.18; Sun, 15 May 2022 18:16: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; 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 5248D68B4F8; Mon, 16 May 2022 04:16:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69F6568B437 for ; Mon, 16 May 2022 04:16:08 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nqPLC-0007g1-PB for ffmpeg-devel@ffmpeg.org; Mon, 16 May 2022 03:16:06 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qPK1nCse88s8UqPLCntbBH; Mon, 16 May 2022 03:16:06 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id qPLBnOEXY8eSWqPLBnsHAw; Mon, 16 May 2022 03:16:06 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6281a5d6 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=1lKYNhKJWht_5WxR-DEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 16 May 2022 03:16:03 +0200 Message-Id: <20220516011605.18792-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfD4cYHGzvTHRiBpZl+ljiM4JaHfv1/zeS3bizGkiRao2p8fB3pmrw0Pdb+z8FDoO5wUDxxfwFfAzdUcdQsxoLSZr2XMxPmKPYCfkcCJQYytWlf6ziDQu 1/giRQfYpskCD6DUwHHPFmRxHgfTL9cyqL+pP1oy9vxENYN+V5Ddt1iyNx6/czUm9N+VyIV3bWZfKg== Subject: [FFmpeg-devel] [PATCH 1/3] avformat/jpegxl_probe: Check init_get_bits8() for failure 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: Vpcf1db6U1oh Fixes: missing error check Fixes: CID1504270 Signed-off-by: Michael Niedermayer --- libavformat/jpegxl_probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 9cd00da194..3de002f004 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -250,8 +250,11 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen) int xyb_encoded = 1, have_icc_profile = 0; uint32_t num_extra_channels; uint64_t extensions; + int ret; - init_get_bits8(gb, buf, buflen); + ret = init_get_bits8(gb, buf, buflen); + if (ret < 0) + return ret; if (jxl_bits(16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) return -1;