From patchwork Fri Sep 3 18:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1549615iov; Fri, 3 Sep 2021 11:40:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8b8j+KBMQn2pL4CdK1wWWoNgZYNCBYRlAj8VQSiJiJjgqhDot/rskdFzmrUSOX4cVIXF6 X-Received: by 2002:a50:9b06:: with SMTP id o6mr405210edi.284.1630694424831; Fri, 03 Sep 2021 11:40:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630694424; cv=none; d=google.com; s=arc-20160816; b=jbpV0WWRykZf1H01f6A9vPPtH0Uq01SC+WsT4XAFNkVpq+HpokbQLdKAsUUPv2crV4 44m0L9PuQKMb4rKSNSfNVNnGurJfG9nFTjxcb+htfwNME51fU7lRhbfOYupKPIKaD6HD sfowN2FrgAP0DcLgsvBsMQtxsNegqcWrY2txi43nrgF0wkULQklZM3RR61tZHFMwCQr6 9wv2iNq9TEi9bXiHhDBIACoC1ZHiAKncsfQBYY5L6uOKRHwr1xg2dlnFYNZVuURfZSsw m3Bb9nrQxjZDLRgQHPVrLXWA0GO7DnSDzayCl3DYXKxDr958MrchRTUXKQ1+fluwdnZQ UOYg== 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=M+3WMllH3mkKv6n+NAZ7ZZT83duhoeTT+0KIYv1OrHk=; b=LsZuze6rSB/Ozk6bEYRu1l9uh7tbP7CQcKCmirmXrtdaKJg0I7//jWhAUQCvAlo40U oiLpOjBE0S2IHbtpeqcmrHEPYfom9troXE/IstWiIL64KSmMYUocMX9kuitHUkVaUIa/ BD8El48uugd7YigXOsuvc9b8Vs3mE2V/PRX0WmiUW3Y7i3EdscvX+sYgmKlViwydovER iyb8jFa8mhF39/jMN42qw4XA9b6AfzUBlFUv5V8KwRFjw0V95dCx7pWS5t2QRLyJZONj GRweQY9tWA0pkSz7c4HvVnW1On0bRigqE3KHJhlvvFpXjNXrV8XIC07aGO7EMNqMgBJe +8xQ== 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 n25si320998edr.243.2021.09.03.11.40.24; Fri, 03 Sep 2021 11:40:24 -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 E31DA68009F; Fri, 3 Sep 2021 21:40:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D3FE689739 for ; Fri, 3 Sep 2021 21:40:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mME6n-002QX9-0B for ffmpeg-devel@ffmpeg.org; Fri, 03 Sep 2021 20:40:13 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ME5pmg0MeljeHME5pm8BMp; Fri, 03 Sep 2021 20:39:13 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=tjhOKfsWQ7_khe2PlkEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Sep 2021 20:39:10 +0200 Message-Id: <20210903183913.15255-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfG2vdnhqwNSVkaafChlL/TVtTG5n6TbTX+35wVzJ2sStFp+vdRYFux39nCvvrLxQfKq+NW7bKVnXugTyjYXJNDTOjLN6zkAIoMo3kOlqmPqJMI93ZEJW FW3ZznaKsmyasHHaBPzV7vMxNOLLj/0X09xxeQF4nQuR/qZEi3teP+fJ Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/utils: ARGO writes 4x4 blocks without regard to the image dimensions 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: zChg8V1E+B5T Fixes: out of array access Fixes: 37197/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5877046382297088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cfc07cbcb8..4f9601b12d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -298,6 +298,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, h_align = 4; } break; + case AV_PIX_FMT_BGR0: + if (s->codec_id == AV_CODEC_ID_ARGO) { + w_align = 4; + h_align = 4; + } + break; default: break; }