From patchwork Fri Sep 3 18:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1554462iov; Fri, 3 Sep 2021 11:46:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWCxS08f5M5nCFzXauHkjeqxA/vwntlJ5Xaa6iVD1u6FKtbinSbYGaLs4cLsdS5WEMs9b+ X-Received: by 2002:a17:906:3708:: with SMTP id d8mr326185ejc.310.1630694787230; Fri, 03 Sep 2021 11:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630694787; cv=none; d=google.com; s=arc-20160816; b=TobJVTw/KWZAVpx8KKUWa65zLrCRR01AjNOW1VFqaVmFZj2HXAQ9TlprLzedqYJa6P 86KLQ6rYpX41yKqJSsz8b5d3Lz5I3Y0obD3mEiJS1BYUJb4ZSPLT9RohVaGLeoF6OS2f XrWkwo8ja0Yrb2B2lprL4x0koz9kyPmraYmu22zekOjBceLLpLvY7VTDr/tIyoJV1n/p IhVLZ5tFNIqbfmANAwmvNKLnIAdFMIxnKbRGPqHdMw7nSciu8Q+qvbviIyd3FDKOKoY2 1/9J2xnmiGuots54rHtuO7JC/wV3ddvbU7tAffInm/Wxhuobdg7DAF742KItNdnWWdQ+ Ktag== 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=j0xZqJOnSIYqgdwABAWIPqr5kEjMAKey646125ywfFw=; b=d3mmn+ovs43thlYjP9uwb+oU6ybrrRYwtkbPGKjCJlIzGn9jETycqGy6ezXBHHtDeE xwCXXv0VQscBZOHfdDJ7YvcXW05j48NTjZA+sIIomp0eqmq8HibpOcXLcg5GY+kgVKmJ B24B0ZJ1jx+BbriCdB1gJBs8q1f+SEIYjIJqo1IOAUSMvOOhoyLhzZpkcpBA9ZtDM+1s gY5bGOVIkU42jNIlf1bcDYbZnox8riroRmkAy6UUFQwCpOXhiZ07s8Q+5mpGFnJBFoXI mVhsn/uX8Fyh1/Zk9R+bQ038BFERKQ5zClGEYjzCAtS7xhYqgkDzHPmvL1q3nW/qvDAn NicA== 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 dm18si34453ejc.257.2021.09.03.11.46.26; Fri, 03 Sep 2021 11:46:27 -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 AA36968A066; Fri, 3 Sep 2021 21:46:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81F8D687F99 for ; Fri, 3 Sep 2021 21:46:17 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mME6n-0056Ep-0A 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 ME5pmg0O1ljeHME5pm8BOB; 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=AVFMJwWia1GJS5pN9hgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Sep 2021 20:39:11 +0200 Message-Id: <20210903183913.15255-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210903183913.15255-1-michael@niedermayer.cc> References: <20210903183913.15255-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfG2vdnhqwNSVkaafChlL/TVtTG5n6TbTX+35wVzJ2sStFp+vdRYFux39nCvvrLxQfKq+NW7bKVnXugTyjYXJNDTOjLN6zkAIoMo3kOlqmPqJMI93ZEJW FW3ZznaKsmyasHHaBPzV7vMxNOLLj/0X09xxeQF4nQuR/qZEi3teP+fJ Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/argo: Move U, fix shift 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: VWeWHxoQ4LKW Fixes: left shift of 255 by 24 places cannot be represented in type 'int' Fixes: 37249/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5754862984888320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/argo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index df9aab92a8..66f3d96480 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -58,7 +58,7 @@ static int decode_pal8(AVCodecContext *avctx, uint32_t *pal) return AVERROR_INVALIDDATA; for (int i = 0; i < count; i++) - pal[start + i] = (0xFF << 24U) | bytestream2_get_be24u(gb); + pal[start + i] = (0xFFU << 24) | bytestream2_get_be24u(gb); return 0; }