From patchwork Sun Jan 22 00:02:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp2203963pzj; Sat, 21 Jan 2023 16:02:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXtedY0+nq2kzDJN6oqIrKXUWJ22diDJ6FoRSIviSbWGxy2e+wp/1WPcmHRYaHPUbDlNisFU X-Received: by 2002:a17:907:5014:b0:7cd:ffd:51f2 with SMTP id fw20-20020a170907501400b007cd0ffd51f2mr18246458ejc.57.1674345755820; Sat, 21 Jan 2023 16:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674345755; cv=none; d=google.com; s=arc-20160816; b=c9Fr/erlydl17lsdSs9WRCzsu3oYgR0d2tuRb6Th/zkFH6cYH7M9r50t0TcuiWbpY3 mA9WXLVbUDx484xfjZ7twvir1HKcEhdpxEJ4A9W1xLFdDKdWNeDZ/67KsvnHyMU62b3W H8nxW4r40Clz4Vw89V47CuP7pJjY1N1F2pOA/SZscdpTHtWlbZNsP4uAFM/qwbQS628G bHDU+hP8mMlW4e72BEGUuHrUldKNf3gFanqWss4LAOppOESt25ixuIDgt/55AbFarkm6 AFh0arKkndQSHZx6c3OYrM17kDQqXbeWRC+ZJT85bGz+++J/ApvLiPOKk8Yx8F32u1Nj mQ0w== 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=EVYGp/7i//hukEIBemmzBzj0FeF1bdYcFdW99iHXiN0=; b=k4s8i8lOMxN/SbRp5NH2+BY+wcKymjiQNqIONw38EdEN7V0r7zO1ArxVEP5aAUIF+e ZF302arlLyu3z6eNa9kqkHjd2xmlUDd09kEKwj/dckFwenPx15eVuhaysgELiVLhNlEG GAjrPDxbu1bzF4bTP7nRFIk3BYne62wHGI8Nc4lTRahRa6qRxFJpxsYnrMNOxp1Tx9HR CTSX3EEqQ8nW23y1o0TmEklR2vkuF897vo5ssbb5tEwn53Evv7y6zERZbWyx8pp1/UR2 GYVua7BcOeDWxehmwJngiTKpL+ch+m7N6NDTKPoFsGqRSBORAqCevgvEVPgrr9QcvWT5 QkYA== 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 hq20-20020a1709073f1400b008709a25882asi19822598ejc.91.2023.01.21.16.02.35; Sat, 21 Jan 2023 16:02:35 -0800 (PST) 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 6401168BC4A; Sun, 22 Jan 2023 02:02:31 +0200 (EET) 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 E15C668BA58 for ; Sun, 22 Jan 2023 02:02:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id BED49FF802 for ; Sun, 22 Jan 2023 00:02:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Jan 2023 01:02:21 +0100 Message-Id: <20230122000222.18719-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/utils: use 32pixel alignment for bink 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: OnCJyWo8pquV bink supports 16x16 blocks in chroma planes thus we need to allocate enough. Fixes: out of array access Fixes: 55026/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6013915371012096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2b63a498b9..87634e3711 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -243,6 +243,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_GBRAP16BE: w_align = 16; //FIXME assume 16 pixel per macroblock h_align = 16 * 2; // interlaced needs 2 macroblocks height + if (s->codec_id == AV_CODEC_ID_BINKVIDEO) + w_align = 16*2; break; case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUVJ411P: