From patchwork Sat May 18 03:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48972 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3253211pzb; Fri, 17 May 2024 20:58:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUstflsTGNYbaWZZr9O63BfDPGjsA9mykEDK1lRChyl7Us3n31qFwoHJ4cIN6MO2FZJc4E+FwhClzNmUWb41p63Ew6dYveNvoon8g== X-Google-Smtp-Source: AGHT+IEawYolhQk82yTdVpj68x459+GDTjjfgi5q8z//aN4Dphx0jLPOiN9dG5DSlltCT666npRC X-Received: by 2002:a17:906:f59a:b0:a55:6602:e3a9 with SMTP id a640c23a62f3a-a5a2d53b27fmr2676154666b.1.1716004689409; Fri, 17 May 2024 20:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716004689; cv=none; d=google.com; s=arc-20160816; b=tl/hxsvUnU/2MvPoopB7elOLo/pHNFqYtisBr/3uACUESz5DP338ekF+wQS0srEtDC wvFwnj54P/qUHnqGs8aQa1DeUei4nVRnHlZoWo9naRYZhBvUZ9aRJHO8WGGdz62b2Lwn G/O/tUcy6C2NsxoQPcg9s2fbxL6GaTkr+6h32vt8ebriGFgG6wT0aJLQLDS8gkkjhcTY 6OaLSgfdxafb+rIM9NMY3pXnVNbbdXcENtIgmvEimmFRfuohTvEkQMSZMlrGqNmYnUEa Jk2TecoB+QVrQ8NxgHM3yoV6bePX7NnGy3UI4jaY5iiuQUpt9RB5Vp1XyLtjX7bOqALm rDUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=mVOpKQlkR5ldFNf6P6sAwaI3X+qlZUxWDGsXujnLQ8Q=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=jlygh7TIwQtnz7nX0rciuBzMtvYTAVgcQDMjfxdZyrPhwzFhtPftbkFPggwXpmtDp1 MzjiQLPKA2yvPV03jbKakh9KX+F9Ru/Vi4By2p8CPSi5t6zW3M9IX4tBdqwdcWuFGXNn Rw9GvD45CjlktRYd40r2dkwlGzdl1Uujt8fgRQBT8y3vfVxqAMJcaOA68JqQo35G+tkf qflJC1LbYJJRMgFX9QlGQgJdQKMbtB+B8Ukel6luDr1w9dxHdiCZ+R2o4X1sSTzAFPAD 0tyy+mNI/VE2j+4dLBd1LPzroA9w8rmdsTgPyCm0hyWkz4K1iVW+cs+Sm3Bipfbxvouu VuQw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EGBfe8fS; 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 a640c23a62f3a-a5ce194bf3bsi282085666b.701.2024.05.17.20.58.08; Fri, 17 May 2024 20:58:09 -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=@niedermayer.cc header.s=gm1 header.b=EGBfe8fS; 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 2E60E68D212; Sat, 18 May 2024 06:57:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DDC068CF59 for ; Sat, 18 May 2024 06:57:46 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 98F1140003 for ; Sat, 18 May 2024 03:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716004665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v9Q9cv6vNgzW/00tvK/24Z/w523qR1dOgKH/i9C8fqk=; b=EGBfe8fSv4WyGf0+e+lVxtqhmy5byPDppHxfJKiBbzqrmsGFKQ9zsoGtaze5aW6Vi/Q/3R 9UBvQhjbwkfriBtTJH5qgD34vM88pATFDFxJNGS52UkI7+5xe+qCn60Wb2g241xVLx1oCM 6uNJ62ILaYvu0TK2odLq+TzPYbzmBQMNo6tcyZR90JgQw3CK8fxf7DTRq7GLDr60xn2VbF aPx8L1qt0/5Y+pqvuLPmIhftRXnRgrIDJzbDIp7VE/r9gs0pBFetUc18enI/nnZcP64U7K tCHb3kAM0409rJoI+EDVKctG+0msnel0EfzQvr15c1wjb5J7yid9D1HG6lBdcw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 May 2024 05:57:36 +0200 Message-ID: <20240518035743.766552-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240518035743.766552-1-michael@niedermayer.cc> References: <20240518035743.766552-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/tiff: Assert init_get_bits8() success in unpack_gray() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rAc8FXbjVJoB Helps: CID1441939 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index ca7e9f6aba9..31de6ad7308 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -457,7 +457,8 @@ static void unpack_gray(TiffContext *s, AVFrame *p, GetBitContext gb; uint16_t *dst = (uint16_t *)(p->data[0] + lnum * p->linesize[0]); - init_get_bits8(&gb, src, width); + int ret = init_get_bits8(&gb, src, width); + av_assert1(ret >= 0); for (int i = 0; i < s->width; i++) { dst[i] = get_bits(&gb, bpp);