From patchwork Sat May 18 03:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3253180pzb; Fri, 17 May 2024 20:58:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/vietytbpfOosEIJ3c67B4C66gUFKDNWqT+JXMVIAajvTyJGmQNWUXYqYRcgquM8s3nfEjy87R4bhT0JGBSf1JpugLiy11Qo0EQ== X-Google-Smtp-Source: AGHT+IGILcuAkhxcjvpt+J6FydKVr6TEh9lmr9ji9TNvdCuLXmcbM2lkVxomMZMuLniH8r9xMSye X-Received: by 2002:a50:d793:0:b0:572:3fe4:18b5 with SMTP id 4fb4d7f45d1cf-5734d67aa8fmr14608474a12.32.1716004679778; Fri, 17 May 2024 20:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716004679; cv=none; d=google.com; s=arc-20160816; b=Q/v900l5FTPGrln4kMVI1sabd8XJooGZwMoP3nudicPwE12v8MPajlEo1tgKFqxExR xamqGTNWrbBzILDWiXovsSUnnP44ogpI2mYY/5AbKxJcpo7Tz8K/5qw7pTgGjm8ubVmo JaBRJskj6NjnLxb72tVNWv0ReWWeWDLkDPvCN+Kmp81Fiy9W9Ckmoad1WPuQdkqayuGS 5yByoboeIrePDObBpSaJNfF5lmJgEXHo6L3miXQvQrEcw8RgNXsH/Ei34W6f+zUNbR8z 5iPUbvr6SvazeYkd05iKX5jfxw/V+v1CGSj/kUBJ7LBZApfGep0xXKxQKLgmy3Dc6kNo jFQQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=beexVSUqGSYZg6ihZvMaL5jadLAo9pgER2vGAm4P3Ec=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=CXFiMdwB222Y48DJUfjR2mnGfl9N+Ak75ZOCtLVi/ZKP5cwKKLQCTK1ggL9HKQglKE PKoKqDndr9vv5xhDkr6LQd/xYzehwbCZGCPwgTsDieY+VMcp01gV3hJsDiOmS/RStKN4 nieSNjGA/PsbVTRzsGSmY8x+WUcQsHCYWDie2BIHZrfsjmqwTzis+mpShIcQkjsSg3iN 9rbIWRyLP/BScPyUPo79bMmcAwNgHgg2LhJsQqoZ4lq6xv376hZw48rR1dM0tG+0Qyyh OD01siakRJaomB+vVVTXawfvb3t/NjlKpw0ZSSF9XzmwPI68ueIve56dCsDpOyF9xbMy 5AJw==; 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=bbY7BFHU; 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 4fb4d7f45d1cf-574d94a9efasi5593370a12.534.2024.05.17.20.57.57; Fri, 17 May 2024 20:57:59 -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=bbY7BFHU; 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 0D40168CED8; Sat, 18 May 2024 06:57:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFDB568CF59 for ; Sat, 18 May 2024 06:57:45 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 85DD020002 for ; Sat, 18 May 2024 03:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716004664; 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; bh=YAjuuDE8hVjAYUUs/2miqsho3lizPTr3cdh+3yYQDSQ=; b=bbY7BFHUP+FntJ2r8BJSLCxxGxDjHDb82XBNwgd/0gWlXGjVrRcb+fxR27sgRgTSdHKqpz G/mpZaCm6N3XMzm7/b5pemHupy9g/mZW8gOLyLY7C+5XrL4VTfv1/EQPdzP4E9LiaXzCjH N5qa15yn2mp5nHThvPjhUqX2XcFDNK7W8ccVV4EDfgc8it6n1pqmOpoOtNBTCeZ/gdyVSp T8l5ePVxHtkoTEi7uD1QMSVeRuBRHRPqYPgCan35C0UDlKUjDmHIM11wZYO4ODgf44itCT gwRg4Vxk1G9FajMOQK5u10Pbjsc5wVWk4aAGjM73S8mBZ+eWVIYJ9i5PgzQY2w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 May 2024 05:57:35 +0200 Message-ID: <20240518035743.766552-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/tiff: Assert init_get_bits8() success in horizontal_fill() 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: U4AB3UBkhTTi Helps: CID1441167 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 19301d9e490..ca7e9f6aba9 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -422,7 +422,8 @@ static void av_always_inline horizontal_fill(TiffContext *s, uint8_t shift = is_dng ? 0 : 16 - bpp; GetBitContext gb; - 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++) { dst16[i] = get_bits(&gb, bpp) << shift; } 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); From patchwork Sat May 18 03:57:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3253244pzb; Fri, 17 May 2024 20:58:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoO9ClTg+8BR16VjpXB/+snoaXjuH4kUeiAJzJc+rMje6oW4q/havX1b9ji+bJl8vjbXPv6faBj8G9NXx6qkUSoXoX0LdRGDB2FA== X-Google-Smtp-Source: AGHT+IE5syme5jEIc4h8kj+JZCh0E59DQb4CVzXsIrr/ZUWnwFKhBfA3NNtRwLIwVoK6EqOyLOZ3 X-Received: by 2002:ac2:4982:0:b0:51d:3fa4:e997 with SMTP id 2adb3069b0e04-5220fc7ef8cmr15046273e87.33.1716004698754; Fri, 17 May 2024 20:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716004698; cv=none; d=google.com; s=arc-20160816; b=BwApBzoDInJD3XtwmseHChtw33/x/EKZ/SwyX1LHzM5m4lUhGiSiPwm52HqRybmUjP yN7hJiq5CygK7GnWGmmNEm3s0tUAqbsqIJTV2iJZ8iXL4Q1aE9ngCZcOXMLhRDigLRFc 9HRd0Y9fNv8F+HnWQc8dWkP+iUubApKclxCuch5uEE1Z1KRXIy5hiJpy0j+QIwAYAoaU 2uZK8bJi3YFtSOieFUpHDljZppZH9s05jJ942St7Kvjzz6HmHOCAjhN/UpHBBMoiIi6Q 2oyV30W7y/r1567QMcH+ExDHDP6BSsbPnRKrTddVwbjyOIFnbUexdNRMcd0PVAgm2i2M srNQ== 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=ZUuJSO0sv3jKrU3/RoyFp+x0iL+AyqK8bEaPiAcXqj4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ib+r3EupunzOjOQRpOOsjulnRXHugUK97X8R6iN6M8ctlh4XAIoyzBBVxgWoAZzSQl wU04Bmgkbhes8HlYcXjME/w1tB+BXNeAiMQxn4/BoVSBTBWTwyzt0GAarfgwaTDxwqn6 NzxY7ihnSv8AEX+XYN5DoaQQkw5SJ0wQ1n6e6rIcEyJjjkilOG56p1lFFUjWbLwjqP75 tW0WisM8GWaKW5WPBKEpQIdT5ui6U6P4VYwxNfWHW5F5Y2dY8Ab4PsuyS9EfF0U6d7ZX FZweK4oqa+LaG7H0VkDyvutShIgYlzoaxxb1KFiRpoMqxqVRGWgJ+qqObjXBQiMEmKvm X5mA==; 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=pyp858EH; 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 2adb3069b0e04-5222f6e2ba7si5336809e87.516.2024.05.17.20.58.18; Fri, 17 May 2024 20:58:18 -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=pyp858EH; 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 3AF3068CF68; Sat, 18 May 2024 06:57:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8119168CED8 for ; Sat, 18 May 2024 06:57:47 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AA146240003 for ; Sat, 18 May 2024 03:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716004666; 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=T5eR8UvAcPr5sPbvVt/HJsD73WJ1JzfAwpJMvt2iyLg=; b=pyp858EHYn7B9iHYIkv5As4a2VhUnqV3/Ci3es91v7xhSFWVMCsmuXoK1DbBFtAN8XzNHG UdAgm3kA5BCU6fWqxagcrN65kqwMzEUADvkoXl92s35tQM2keQQZbvtN5nuYF545ZIHIH3 ypBibAWCvEDskf6gXUuM4bsWfQd9C2U/Y7V9iams/1rclGAof0FR4Ou4ZkSWeRchZyLU8C o2ZoYNu68TA5uZkNb6hGuMK7sJRYm3TEqzrlfC5oxrK+0hjwGYJwITbQYdCl2in6JSFIW8 poywkygkwFDzORJk0ptyGSkFMLwJPPwklEvgAyspLbjavODaKFuI5G6T2qxKSg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 May 2024 05:57:37 +0200 Message-ID: <20240518035743.766552-3-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 3/9] avcodec/vble: Check av_image_get_buffer_size() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bDaUX+/RqZ3v Fixes: CID1461482 Improper use of negative value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vble.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 32157913c77..c585b1ed9fc 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -191,6 +191,9 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) ctx->size = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); + if (ctx->size < 0) + return ctx->size; + ctx->val = av_malloc_array(ctx->size, sizeof(*ctx->val)); if (!ctx->val) { From patchwork Sat May 18 03:57:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3253286pzb; Fri, 17 May 2024 20:58:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8K7AbyG/gTx+ELH0NhWFzXGqFHsKwoC98IvGuNB0HySWNwN+EVXAG7XINeINyqekqmsHc/XmhwSYex82JNpwrNOXyTLmiv3hOZQ== X-Google-Smtp-Source: AGHT+IFVcf1wTGj3mJ3MVK2/t7MZdb1H8RnxxNwhFvLRkU3ZdQOh6+YhkWrD41ad6PeC/3zIOuPJ X-Received: by 2002:a05:6512:3c92:b0:518:ccf4:bd0e with SMTP id 2adb3069b0e04-52210579337mr16737624e87.3.1716004706932; Fri, 17 May 2024 20:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716004706; cv=none; d=google.com; s=arc-20160816; b=HQ3LMt7Jm6/LgyRJMaZ8QORWnb3jof97WYCmsAqpml3Z4G0AcKF81cnZkYfpp60RNI TIUiBgm24E9+gG3Bh+xjpUV1+xOhmXu7oT1bgelkgtB3vOx9UDkTv/R/x8ZzyJNs3T5p Q/PzRJ6MK011Y488MgVAfcmDXShkUS/aW/oxwX37LeNwUCWjkqzGRbrpj9MVCtj7qntH w4WE75cvSQSooxI6lj8pD5rthmlbjXUElrty4S5NSXEOu92LD7mwRV1i1ggtcB4tN+zb fInc6S48w5gfU5cY5L4gVpVbEBT4NIq2qW6h2nxmg5vXN8toSL0LDFMPkxabiG973ejd 3gpA== 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=RDLPgm/Fkfk19qwV6UOrcbCc6Jx5urgOI94Ffsbx5g4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=rXVPi0Pl9Mzo9cmmC+Zwz4BId4qFW5E3Olsh/RLFdNhQMHhjfTr7GZ0lRQCExAOwOh et/53k3opqZiIxrUN6KM8FApqy4CD78ldD3N3CQK+GWe1ifUO5u0ib2k91R8IRQzowNv NW8qxqVkLkxLNohrpEd8teub6TCjQzmCUnVY0nE5rMjdK2BPxjZCsfPgdYI69RnhZLbE Ea23XUlvAv5Aykeq99oBEG+YlmjBHXOiSNQXI0NP5OX+PO9jWWBi7Hjon6RLk0zphFM2 C+xOFGzQTY2oEHhdv0/ymKCX2R6P7npGNYHQJcj1N5KcQYPwUelsNwBw2E8QHbarsU0z EuMw==; 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=Vwv4Lque; 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-a5a17b21ea9si1023289366b.411.2024.05.17.20.58.26; Fri, 17 May 2024 20:58:26 -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=Vwv4Lque; 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 3693268D26C; Sat, 18 May 2024 06:57:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6532D68D0F6 for ; Sat, 18 May 2024 06:57:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AE821FF806 for ; Sat, 18 May 2024 03:57:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716004667; 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=4gAG5H0V7EVfnd/rP4a6YiXmZ7bpf5vJ5opVKoohX9M=; b=Vwv4LquemPBAgSMRcQfh6/9tirIWSBownx/r5lNqGOxeH99QnejKwPPKWp/9yOl6LQW1wF c3EiqnxCxXr73UZQnOtCTVrGd3Y8KrIUgj8IUmOAY0BRM/5IEs1U41XzXVlFsBeiAWlWaM 9iP7kchKnbGNgiikDq1bG7Qxzsyd1YybnA4lAIx39IDNkAAdc1u5wlQPx9Nih8ZWRjAmwO rWnjnXMLpqT0CXz3m9PXyv2BA/sHoS7vbkmAFyeCteVk5/PrawFfcmNrfHlqfR8YCzvo7p pD1IGYiPcNWGTE6lIqxmXwQUz7JBz5YLU7dr3dFhHdcc9linlCGqAP/5fb5Ilw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 May 2024 05:57:38 +0200 Message-ID: <20240518035743.766552-4-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 4/9] avcodec/vc1_block: remove unused off from vc1_decode_p_mb_intfr() 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: c9ZMDY6Uhppl Fixes: CID1435166 Unused value Fixes: CID1529221 Unused value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vc1_block.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index a6ee4922f95..1e8e294ad89 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1607,10 +1607,6 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) if (CONFIG_GRAY && (i > 3) && (s->avctx->flags & AV_CODEC_FLAG_GRAY)) continue; v->vc1dsp.vc1_inv_trans_8x8(v->block[v->cur_blk_idx][block_map[i]]); - if (i < 4) - off = (fieldtx) ? ((i & 1) * 8) + ((i & 2) >> 1) * s->linesize : (i & 1) * 8 + 4 * (i & 2) * s->linesize; - else - off = 0; block_cbp |= 0xf << (i << 2); } From patchwork Sat May 18 03:57:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3253308pzb; Fri, 17 May 2024 20:58:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpotnPOuSrmQdG+uUPC7EGz+eC9sjToKYBQgI+BOtPSDgwQyl7piGCt8erBHJLbU2sW4YtNCT01fMeE6p3gudsdC6EQBazKFaDaQ== X-Google-Smtp-Source: AGHT+IGczkXfJefmO7tuvxoCieDOHl/LcNkES80qEIVTLbqhoTzSAZYCGL2K5bOFpr/spEQLzd7Z X-Received: by 2002:a17:906:a0c7:b0:a5a:580f:8e74 with SMTP id a640c23a62f3a-a5a580f9031mr1180038666b.5.1716004715955; Fri, 17 May 2024 20:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716004715; cv=none; d=google.com; s=arc-20160816; b=gPeMTtXgwDsj4KQF+Z7m0UvaD90cq4PHbmWRmCU35ISJz1Hhlbd/4VyTiDdvIUJUBh pdrFrb759bVlYJ2V60BKQZtlgR6yJOyPCm8yD5rIidKMFsBzzr2zIyYMqc3m/+gJakdm dhvTwrEkFhRFnvsnYVoTXQMfJF5SwqRfUr+BIw80jMUT/tZULdyQipgKM+ZATy9rswWL uK4bDJ0wYE2YdX8aEAEZR2G6jEjV8UFFR5fQhanoQmjik2tYgwLJD92nXf6kK3HLiZSV 9//cvqhWBmQ0Jo6fvs9egZNXPrXncA4dpprhPBRSBFzH8c66ul9SE6uZkrHlxWEl6mZU wrZw== 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=1emgmVsSxBAXM3iJdySEbuyniF5LGSWGmE0dCRJmWlg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ZROCEhBg1XcBwNLei+80QSRuo+tigxyp7+eptpwjRS8hOylPoPH6kZ9pk41PKKWp2g sT6DcqN9KKI2aY63fECVzi6C88j8H45vp31TimDkRs+uLoNxvQlR4zdFQ7IU/HRgnt4U FiV9HJL1HQxo2z57xMTJmKQz9RmwrazyFMNvEgp+HeT+4ovNJRdc2Q1pvjtLyAMfZbzL d0MjiqmOEeOIloBk1lhHKyFb7uORSginBIgk4TT5ZOol6vlN6FjQ8zO37SS49nr/C+Z2 11oqRpBGRfPzYZhayx4QbrcClF1/6OJ8ORk2Lh06fhhCWcMVy5geE8YF+iuJKSrnhfjU IxBA==; 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=S395uNDo; 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-a5a1c9c8372si1072049166b.458.2024.05.17.20.58.35; Fri, 17 May 2024 20:58:35 -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=S395uNDo; 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 8D04868D293; Sat, 18 May 2024 06:57:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8490E68D225 for ; Sat, 18 May 2024 06:57:49 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AEAFFE0004 for ; Sat, 18 May 2024 03:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716004668; 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=6X8ii1FNA1DJDJELRYD8nKYxoB1Pd7T2fjWm/OQQMfM=; b=S395uNDoUzeNyOwZXq9A83CHelzsWHOachWqZWdHJVu1adEDOKBREuhMjY0G5fpgG3HnIC Q6aoFK+82pvxKDNWsr7OiA8sx9nt3rYk6V0yCkzE+EVaKQ9Je2TWxi/Qgmjqu6pHCtQLrl 3MowFLoCVKZ8OaO+lem4m0zgCTTpKWyQJK7eAU3dl6Qvwxvy985SlHth+WyuqIKk72JaEC YmCSxB7lBTy9Pz6caAETLU7TSqmwDv4QOXt5ON8G3QLypY+DYjE718VUhiTzO94pOyE0gj wluiBrj2wR6ceox6iPzsEi96Dkar7oxWLl5IoDCAjTz9wymCnj7OfhNE5jQyJg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 May 2024 05:57:39 +0200 Message-ID: <20240518035743.766552-5-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 5/9] avcodec/vc1_block: remove unneeded store to off in vc1_decode_p_mb_intfi() 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: S32OUNWfrDfi Found while reviewing code related to coverity Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vc1_block.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 1e8e294ad89..322acebfe50 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1771,7 +1771,6 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) if (CONFIG_GRAY && (i > 3) && (s->avctx->flags & AV_CODEC_FLAG_GRAY)) continue; v->vc1dsp.vc1_inv_trans_8x8(v->block[v->cur_blk_idx][block_map[i]]); - off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); block_cbp |= 0xf << (i << 2); } } else {