From patchwork Thu Dec 23 21:15:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7621260iog; Thu, 23 Dec 2021 13:17:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcy5V9Il0iFXA9EMuJaqvmPsdTuOt5/J/kJUXGXHyKf/XMoBMjf6I2X4N6Dz7hQZw5o9nN X-Received: by 2002:a17:907:86aa:: with SMTP id qa42mr3261269ejc.106.1640294242627; Thu, 23 Dec 2021 13:17:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640294242; cv=none; d=google.com; s=arc-20160816; b=RRdyO/JyI0b/PSpXyrSfWdh+BVF+sLXPmzeWLxBxrorhZPYlChQfo1tA9KIrqaISs6 p9MaAgkeucFpDbhSwH3Jo5ksOViM3lFNrxoGmuughce0qt5Mm1UJtdbaHwmwRPZwvbHf s1wx8TeWk6DLok2KYiHefxmgI1q1q7HJ+weT8zCBKq6S178Y18WnUPFnANM/uaO+LD0n s2eN1gX4O78B681V+ggecSTsN3RVf+R8mzahh4S2qV5pfQTTgI3tM8u7xg5VU9zx1+bf 8J+pAz2bgMH4ITY6bD3mIG0JuAeMjJqk63v8DKbPflVvfM0EqO3Hh048lAEK8hTbJn2M iFTA== 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=Rra3mr2Q1tHBZOXS+6aQf1rJkKm+/8wNWqsqwkWU72c=; b=vpETB4WtSJ+Nq/JL9yZ2WRdB8Ly0OHvOeKyc13fOpinvgTLbuC+TVCaHzTXcHY3hej sBtVwnE1PgzAJHujqfgEKH8AMFnk/pVBIUwWxhKsa0pnjWdQIv9HkbBOJ4/SYeQz8AfT jdlr/m5s8WtYoYN3Q3p4XvUsMQKnJ3vyOUH9bshHAYzKK4Kq3XlNTl1EtZalTc30XKa8 sSepVDYzKzI1MvdZvvWNWxv1skhkLCXrRvhxNJIMBZsDfuyXc+fuMVCpWLoZwP7gKN0U iwpZBotm03t4lLrhrP5QSsSJbQ24prh7MUHVfOfX9Id8PKziNmePt2uQO+sxADX03QRo RBhQ== 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 u11si1256064ejt.38.2021.12.23.13.17.22; Thu, 23 Dec 2021 13:17:22 -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 F3A6968B1D9; 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-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 A0A6C68B1B2 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-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n0VRs-006Nz2-0E 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 0VQunM8N3SgGF0VQunabYe; 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=aqyFfHkSW8-hnrmUHNkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 Dec 2021 22:15:26 +0100 Message-Id: <20211223211527.20408-4-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 4/5] avcodec/apedec: fix integer overflow in 8bit samples 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: cf0rTldlinwO Fixes: signed integer overflow: 2147483542 + 128 cannot be represented in type 'int' Fixes: 42812/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6344057861832704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 35a2e617e69..b932263012e 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1587,7 +1587,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, for (ch = 0; ch < s->channels; ch++) { sample8 = (uint8_t *)frame->data[ch]; for (i = 0; i < blockstodecode; i++) - *sample8++ = (s->decoded[ch][i] + 0x80) & 0xff; + *sample8++ = (s->decoded[ch][i] + 0x80U) & 0xff; } break; case 16: