From patchwork Thu Jun 1 22:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41941 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp803327pzb; Thu, 1 Jun 2023 15:26:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ47Wc0Mejci9TcXx6MxlBDN9mSiH3SoCwj+8WeRae1YPNW3cKTKMT1jTSoFdOGnsVFogZzg X-Received: by 2002:a17:906:daca:b0:966:54ac:17d7 with SMTP id xi10-20020a170906daca00b0096654ac17d7mr9830542ejb.76.1685658391355; Thu, 01 Jun 2023 15:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685658391; cv=none; d=google.com; s=arc-20160816; b=Fc/R7AUxraqyWzPsH24MdoFTc5BgkkIUQu6IVB3DbXnYZhNYh+ECI8+8UcIvd6hfVo Ntlv8GLbTJ67rVEF2icNWRdxmSrBjHi6SAPNi7T9xKho27zOu4RLx6TkOEj8CeC3JorY I90XswO9Z+sDUzqEy7lllMn19pnA3xOttIjUqR49NzEehCx9MHSDl2MNZEIbavwLL/51 zqNa6rviL43BhjWwti3EH+E2l1DfpIPZAttjDKIhkUTd6oTYxQ6YbYLpWGsQFMi8VemM QHDDzbqfhkJhvI67LMd2GC2h1BmhvAuM1qZn0FfQwQUYsEghKHp7w5Zc0cXiEe6j471V xXRQ== 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=w9v+/5wT4XISvTFFU1xlDbTuP36jfQsLmYbyzN9Chlc=; b=fxridFU5q32bmWhBU36U+22ctyP0+VGnIitCVtMQqM4oknZ4C/TwsjRPQYzjmQzWFw XOGXH0bE3JP9KjigK/uosOq6sI+HZODFs8H1kl/OiF2qiF+/POM0Ippd0Bbh89tEJjII p7HIkgoHRLK5zcX6RcqtYi0IFWGN7iDqVOCIr1ZEX5WVGvwR1PJx4SYS9eTUpSVKcwNc HvXpXe2qs/7+bG1ZagUvJVqbpzlWCj5VQqLYJNcVl7vY4AuYpMHD4tgBsTEvlvGBW/gO KFw4sBt80YJcksw7N43vdL5JtZekQg+ZpPgDqP5Jo/5QFo2Q5pPvAgO30z0C331B/31z KdYg== 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 n22-20020a1709065e1600b00965afc473edsi4126708eju.884.2023.06.01.15.26.30; Thu, 01 Jun 2023 15:26:31 -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 6DA3968C2DA; Fri, 2 Jun 2023 01:26:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEEA668BF62 for ; Fri, 2 Jun 2023 01:26:04 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 33CE860004 for ; Thu, 1 Jun 2023 22:26:03 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 2 Jun 2023 00:26:01 +0200 Message-Id: <20230601222601.12631-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230601222601.12631-1-michael@niedermayer.cc> References: <20230601222601.12631-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpeg4videodec: more unsigned in amv computation 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: /XNGLthUAywq Fixes: signed integer overflow: -2147483648 + -1048576 cannot be represented in type 'int' Fixes: 59365/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-642654923954585 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 d456e5dd11..72c8ad3048 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -861,7 +861,7 @@ static inline int get_amv(Mpeg4DecContext *ctx, int n) for (y = 0; y < 16; y++) { int v; - v = mb_v + dy * y; + v = mb_v + (unsigned)dy * y; // FIXME optimize for (x = 0; x < 16; x++) { sum += v >> shift;