From patchwork Sun Jul 23 18:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42925 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1483915pzb; Sun, 23 Jul 2023 11:03:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRKC4MFwRadexWa4vS7WELb3FRx1t6ckGU6T7pWv9gae/zRRAeMb/uXNEt2JF2fO3mLqpT X-Received: by 2002:a17:906:209e:b0:993:d617:bdc2 with SMTP id 30-20020a170906209e00b00993d617bdc2mr7799500ejq.75.1690135413623; Sun, 23 Jul 2023 11:03:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690135413; cv=none; d=google.com; s=arc-20160816; b=U06TGYiTPFm98dYf1h837le1l8Vq0pTIqodqP3H2auxxYMwZAR+31o26aM4FK+IA3p R//tkWR1r2GhMKxmatu9l9LE7cLJHIAE/xxNoSCzL0JCzz9rRVaj3BGiWiP8nA1tql2J EcIkBcMaQ5nWh+J4d5l8H6Wjc8dbs+sM+G54Ou5b9OWO3NCvcZmnE9OyOjdfmRgeKeR/ LXm2LMGMA6W4KnxNg/MLyNfBa1zoZXb4uh36Gd9BwvLOam+WJ5hOwZp21amb9u1AtICc B/Qw/KV8SlbGYhGnZK9HIFOLi1xXtWdyAR1BHzJyoICQbYNvAyNaMBi2Y8S3dkAcIytg pPEw== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=tmBqDbLTJ2L6B927gsT5O2ecZ4I3e0oPTyo0MSPCPyc=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=DSr+rYPOdfPy8QmxIb4/9G7vX2hU0spwQZ68FF+C+XeA4816NPI6bXL8vY1vNcog5B 2AgwGcthn6aPIt0/CxMUt4JppLaKn/OS2wSrU76SxHFu7KCiDjkBZ6qQrW1LWEf8Ern2 mFVJ03aJKQjQBbO9YaKth+x71svRjqFQj/CLZGURrJS8KopwoD8j/wfYk2fpg9iAH7i4 5KixyyFLWMkzwTCKWVgDk/EkLDEfyqGUgi6WJoPQ2ewX4KNX1OOOh+/RRn0e2Qo+UnRq MJGr8F2+9FdwlBqq/I/KTAIva7ezx4b39T0wkj/f2j2xR7yVttMCTcD3xi0X24iIHmok FcBw== 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 bx13-20020a170906a1cd00b00987a1823cfesi5115865ejb.569.2023.07.23.11.03.24; Sun, 23 Jul 2023 11:03:33 -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 740BD68C6E4; Sun, 23 Jul 2023 21:03:12 +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 0D79168C6A6 for ; Sun, 23 Jul 2023 21:03:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 64E0EE0002 for ; Sun, 23 Jul 2023 18:03:05 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 23 Jul 2023 20:03:00 +0200 Message-Id: <20230723180303.8000-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230723180303.8000-1-michael@niedermayer.cc> References: <20230723180303.8000-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mpeg4videodec: consider lowres in dest_pcm[] 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: vdbTTC1++rfb Fixes: out of array access Fixes: 59999/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5767982157266944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 30aec5e529..b7fab5a4df 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -295,7 +295,7 @@ void ff_mpeg4_decode_studio(MpegEncContext *s, uint8_t *dest_y, uint8_t *dest_cb int hsub = i ? s->chroma_x_shift : 0; int lowres = s->avctx->lowres; int step = 1 << lowres; - dest_pcm[i] += (linesize[i] / 2) * ((16 >> vsub) - 1); + dest_pcm[i] += (linesize[i] / 2) * ((16 >> vsub + lowres) - 1); for (int h = (16 >> (vsub + lowres)) - 1; h >= 0; h--){ for (int w = (16 >> (hsub + lowres)) - 1, idx = 0; w >= 0; w--, idx += step) dest_pcm[i][w] = src[idx];