From patchwork Thu Dec 23 21:15:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7621142iog; Thu, 23 Dec 2021 13:17:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfFinSbskTdSHxSZj587dWBsenxyUG9t6ZEPk2AxauiMq2w0HAmqBdPKyb73QUh9fh1XKT X-Received: by 2002:a05:6402:3496:: with SMTP id v22mr3448889edc.263.1640294232024; Thu, 23 Dec 2021 13:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640294232; cv=none; d=google.com; s=arc-20160816; b=reL760igiAmk1JpLK3M+ew40W+Ry/LnHXGjE1jGiTa3jfw53ztOpjKdk4J8NtNvefd 29TIjtFbiTEflRRZ+v80ekL+J5jYMBaGyLQQ6SwIv0SgGiADytcvB9X1g1pNMs7GP88X nBXIHqtYPJ+BbVrW9SgO6WauPl+2FgKF2VkMZwpULygkpnLP1pn1YFlFP1ebbEwUmFZM mGA5mHGsjLUyRyhaioh2Jj0O/WT9i+LdZYm1x+hKEWafnK9zRPuMtIeXlBrtfbFVCAbw nvfEhqzloXi0Re4CkgNdX3PuZdmSRwVIfbyfDoqCewZ4IlMZ5VUoWqjvVfVurXiJem1C xfJg== 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=5kehwEt0p0Ld//oncFNj0iI7a1p8jCRDV/74fMD9rzg=; b=Rb103WzSrD/t1NqKMx7VQO/qXshTv1Qj5x43t3EzppAeN+qbM7Edzn4pJ0xI035Dd8 9vrjPVvMDRUFpdYzPYhpatay4eM7rnAuAnB+PnH0DmZj7MAmIlDgpeleIItUkq3NK+Xc pHcqkzVXnjsyOxa9sRiFrgINaRsgtMwLrMAAJnFSXD2wWmHInlAuE5+/aWhblOCAmpGM RVeLCsGa4gG0RbC5WB+5ddJi+El+JMsPOrOfhYM5E8L2jeo2akJy35hOu7dviV0EoXWv EAvat5y6c9WMx0dq71VwI6s6Uja9QIvJJq28CNsSLJa2ktcKc4ImNm/Y04HLGeXyXNb+ oAbg== 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 g13si2406405ejo.123.2021.12.23.13.17.11; Thu, 23 Dec 2021 13:17:12 -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 31F3068B1D4; Thu, 23 Dec 2021 23:16:38 +0200 (EET) 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 8D0BB68B1AE for ; Thu, 23 Dec 2021 23:16:28 +0200 (EET) 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 1n0VRs-005l9p-0F for ffmpeg-devel@ffmpeg.org; Thu, 23 Dec 2021 22:16:28 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0VQunM8LaSgGF0VQunabY8; Thu, 23 Dec 2021 22:15:28 +0100 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=f8Q2+96M 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=NEAV23lmAAAA:8 a=EXflR0fOmIkgLJZ6d4sA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 Dec 2021 22:15:24 +0100 Message-Id: <20211223211527.20408-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211223211527.20408-1-michael@niedermayer.cc> References: <20211223211527.20408-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJcCTGtosQs0tcnrCF6utPh4b7FPGgQcBTTtlULIlnhbS2gmYLQdWZYQInFu+WDmgh5n4rl9VA0ffK1CvYlGu2+ayU9KSj0MgxWsGvDhjbPy77z3VKgc esBOUieu13Ozs/rN7/r3DF+TIEfB7FFZazgeK7wy20iLl22q29G4xW9u Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/cdgraphics: avoid signed overflow in alpha 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: fHY9/zzW+rvz Fixes: left shift of 255 by 24 places cannot be represented in type 'int' Fixes: 42766/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-5142826105569280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cdgraphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 06f83920943..f54ce5a05c0 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -122,7 +122,7 @@ static void cdg_load_palette(CDGraphicsContext *cc, uint8_t *data, int low) r = ((color >> 8) & 0x000F) * 17; g = ((color >> 4) & 0x000F) * 17; b = ((color ) & 0x000F) * 17; - palette[i + array_offset] = cc->alpha[i + array_offset] << 24 | r << 16 | g << 8 | b; + palette[i + array_offset] = (unsigned)cc->alpha[i + array_offset] << 24 | r << 16 | g << 8 | b; } cc->frame->palette_has_changed = 1; }