From patchwork Fri Dec 3 17:19:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp955247iog; Fri, 3 Dec 2021 09:21:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd9Rx8Kj12nYV6UbY01YbLfqv+e+onE1d7cL8mGcSqMijiFvG4uwyCTgQyNrUP/mQewzxW X-Received: by 2002:a17:906:3408:: with SMTP id c8mr25092618ejb.41.1638552070960; Fri, 03 Dec 2021 09:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638552070; cv=none; d=google.com; s=arc-20160816; b=NBanpNe1Lnt492vVslmsYlXIXJzBGor6CxM228qb9l+y0Yqt6ZftViNWzJqOl11jLU 8hijNZ/GY+E5kbYZfJm9PjRS5Q8FIzy3ssvxqUR4lN0x8htluF7rVZmeWn0q1OYjTFFd kWdk5fOa2t5x7xGMUISq2lHQUT/EC2jH2cz3f2DmeteC3kOQMSBhxVHZWzHX5+8j8/Hv lxD5lA++3zG8XPvrRjxzWRsFWY8thmqc0LYOWAqsQI5jUIS3r49Z/HqgLETAqvznZCKs dtINclq2u4OYAjFqmiCmwADxQurBc35IM3pE3MOcrOcsG1/hOuPVxRXJIblBTngNWwJv kS3w== 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:message-id:date:to:from:delivered-to; bh=3SmHCmVna3gIayz7/VSbJqHPk17fen3sBX+u43esqLk=; b=NwHFdiDkvGHt3PFNds37z/Qb+1BppSERfoQwFbsoI+ob29Z55nr76JWsgtd+yNHrQU JrJvE0SPwwOXiAGbEtWREAlXdPIaiAXUSUetNoO3V+gc6TnXrTSwpUkYZ2bz8JJT9zSl ZQOHNQ9aGkc1eci7m4olX07dGHnIDZqUJC6qY5ifIFUNOuUd5c15aIo9NHxsMEWPXqcT 1vCKgVgip8ihVcOFI22vduc3W/2IBcM5aX68jOpoMIBQHX62knA1prEdZQssoXgQRQn7 IxIa5ioos7jwT8n6QR0q1hrh+vX5xAFGakAd/ikA5Xvqv0awnjkoh+LTSH4lr9KEvtze +6ZA== 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 ho36si5772027ejc.607.2021.12.03.09.21.08; Fri, 03 Dec 2021 09:21:10 -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 E222868ADDE; Fri, 3 Dec 2021 19:21:03 +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 2782268A98D for ; Fri, 3 Dec 2021 19:20:57 +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 1mtCEy-00DjIv-05 for ffmpeg-devel@ffmpeg.org; Fri, 03 Dec 2021 18:20:56 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tCE0m7BgVSgGFtCE0mKbjw; Fri, 03 Dec 2021 18:19:56 +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=7vxmQ9Nlv0N70OH3X3sA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Dec 2021 18:19:53 +0100 Message-Id: <20211203171956.12231-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCL8c5qX9THcgYxo58lyIfZMJMKvBtumH2Jxp/BsDwkxOPeHomHAJxxDMCdU08hhCQVuIHt0k19vpeQV1eCbCOSJtC16OqwhOOEQhlAb3iVMtoRLoldd 3O576UZL67+N1ke1qKdmIUWGY0ZuiH5P3nM2po2w2KZoA2NdFWD6bLY4 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Disallow duplicate smdm 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: LVAbMN9cx76o Fixes: memleak Fixes: 39879/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5327819907923968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5c74d099dae..e34453432d3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5405,6 +5405,9 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version); return 0; } + if (sc->mastering) + return AVERROR_INVALIDDATA; + avio_skip(pb, 3); /* flags */ sc->mastering = av_mastering_display_metadata_alloc(); From patchwork Fri Dec 3 17:19:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31918 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp955884iog; Fri, 3 Dec 2021 09:21:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzO1Ez142HMLdfOG/KUfTJt/cwnzO3Vcog7WxpTzrp+Lh8TOq5ZKWdiN32BFPfwLo/P8Wwi X-Received: by 2002:a05:6402:1d56:: with SMTP id dz22mr28064219edb.291.1638552101595; Fri, 03 Dec 2021 09:21:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638552101; cv=none; d=google.com; s=arc-20160816; b=OYcOULt2QEDOCT13MxZEQaptkJRIfT0lJTUuP93BAkckxR8dCUxfkfVd1UYjtSSraP L4MyFNbWIa9gagI0TuKx+mc/cpvXdhBbS+d9tOQIKx3w8Q/U0/5EywDB7Fh0jkPrkPp0 4D2XAlV9ZJ8JIu0YrxB/x7iueGT9AL1OwVdXt6+e3iCpWc4nfej/qdsb5A8phZhCKCFM I99JC86zWJ+BfXnWLUDUg1cw65LEfxejh255rfzsYkXSZyItN9MnP51sky7QQZwL2wEv nAy1OWdrSNe3lyH8xql/yxRx99er0pkeLM7ZiTd0rcz91NqTxXG1kQZW/Rg6pZn55P+d Ymgg== 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=8hj4L+9Q+yuqvW5a0AQAYp/xyKNDWx9OxalRmRMAs5A=; b=T7ujOmq0ygJuwnPiL9Kr1j4tRMEMKC3jYBpw0fDIIP9fR0BIAX5F57Hcmqv5tdSauM r5uypDDBhNADSqagbSB7dHWUFDSJgd7TFbwU15Luxyscx+FskVD6ccT+39eMtlj8ExaS 8tMgJdCCImYBZBnE9qc4pdctr8VBShKlftvMEyCCbJigrEE9ggQVtuhqo/N2zBCl+9Il Xl1OswWWdCThwZN2aIMhvnITtQmbZNQWqhgp0bnhJJI4OuSTFQTS3CKlnitiE1lz7zsW WtnpXs/5821dLhdN0kcDaiKi1iVpszthVowA2QlesvYvd8fy9yHAoAP7jcJIHF+Homsx pKkg== 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 cw22si4606666ejc.46.2021.12.03.09.21.39; Fri, 03 Dec 2021 09:21:41 -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 6FF5868AE64; Fri, 3 Dec 2021 19:21:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C704968AB71 for ; Fri, 3 Dec 2021 19:20:57 +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 1mtCEz-008HUR-0L for ffmpeg-devel@ffmpeg.org; Fri, 03 Dec 2021 18:20:57 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tCE0m7BicSgGFtCE0mKbkn; Fri, 03 Dec 2021 18:19:57 +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=sixEfw3dgXfOZcHC9fEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Dec 2021 18:19:54 +0100 Message-Id: <20211203171956.12231-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211203171956.12231-1-michael@niedermayer.cc> References: <20211203171956.12231-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLd6wMgCCOCghu0cFGwb4Qn3hHuNZoAWd8F2exKFbXdj4qKkTDwVOgeH9d8NWgvhv/rbMao0VkCpusG2LR8t78K1fjHK1yhJVd7IYGwj5VcpEp5YHt1A d+2ZbNPNMPAG1CySsK0LSI/kisjrRDus2hRfpRzitnLGItM8jAVy39XB Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/apedec: Use 64bit in 4/3 calculation in do_apply_filter() 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: Xti92KoBQrVf Fixes: Integer overflow Fixes: 40973/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6739312704618496 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 9c723f29977..5c3261cf5cb 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1337,7 +1337,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f, absres = FFABSU(res); if (absres) *f->adaptcoeffs = APESIGN(res) * - (8 << ((absres > f->avg * 3LL) + (absres > (f->avg + f->avg / 3)))); + (8 << ((absres > f->avg * 3LL) + (absres > ((int64_t)f->avg + f->avg / 3)))); /* equivalent to the following code if (absres <= f->avg * 4 / 3) *f->adaptcoeffs = APESIGN(res) * 8; From patchwork Fri Dec 3 17:19:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31916 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp955656iog; Fri, 3 Dec 2021 09:21:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxG7vxuhdXzQJEI77jS6EavKO9Gy7auZPFo2ppgAOq0heQJ8bTbAuZ3RqhSBgUhE8i+34MT X-Received: by 2002:aa7:df9a:: with SMTP id b26mr27422394edy.107.1638552089444; Fri, 03 Dec 2021 09:21:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638552089; cv=none; d=google.com; s=arc-20160816; b=0Dh66EzxA4BX0DGCc1DGtuUrMzfZNL1cMs9//aWXTGnt6lg0nYIrp8FGBfl0V0p0SP VOlqRclDcFYi2OKsDKE/WBzX41q0r532Vz70U2k4Y0Sl+hPP37rX6yThym+Vy9nSFSyF NOQ8sJnzs/On6d26SjvyLliRRPZ3/zyr2I29irGaWlaigupt1FSPL8eh76eaUjYUDnrL YxX9pus39KRIYAx79P8fC8KHiUzvdOK6P/h4n6KrJ8KQS0WrXnvzurC1Nkm4K2wvBkA8 OOIq2jZL02c7fW+JxDC4SAjBXm1n95teOcyFS9+GjfLszzmx5bhS5q0HLKXwZF32kumu KLjg== 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=Qkf4jYu5L0tAIgCeTvwQOA761cpJ55YYjMmakG6WVB0=; b=IRo13PrL+CuwkrJml0Dz4FAWWewM9ds9h0UbYceOhy/clHe0X1aIooVSjqrQT/98Lo oKuo70lQgMtapiT0DHngBe4Xeek9tFuyRuD5SPhtqzcgzTIdyi0nt59I/3Yoqm9cuu0w Ry7o1wF3tSphdC6iNMQJXSxCPhecn8z/QApd1EDjXOgfdJulFJQIb9maCkk8OIMG0ORo V3y16HvVMWmb4FGaPK8zuMkz4oPEhRJKE16eQOYhhsh2SzYRfF+jcQwNBj9EOLisQLLj ZrbUu+bIdhbUdIVUBBFbECsNYhk2jmKgFh8uC5cN8hhZgQc6Yx3xYKkGg48xO9HynN5A DZdw== 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 gt40si5479346ejc.310.2021.12.03.09.21.29; Fri, 03 Dec 2021 09:21:29 -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 5C13168AE46; Fri, 3 Dec 2021 19:21:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2B4368AAE6 for ; Fri, 3 Dec 2021 19:20:57 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mtCEz-00DNEn-0L for ffmpeg-devel@ffmpeg.org; Fri, 03 Dec 2021 18:20:57 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tCE1m7BjkSgGFtCE1mKblG; Fri, 03 Dec 2021 18:19:57 +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=v20YgqwhIr7Q-Qh6m88A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Dec 2021 18:19:55 +0100 Message-Id: <20211203171956.12231-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211203171956.12231-1-michael@niedermayer.cc> References: <20211203171956.12231-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLd6wMgCCOCghu0cFGwb4Qn3hHuNZoAWd8F2exKFbXdj4qKkTDwVOgeH9d8NWgvhv/rbMao0VkCpusG2LR8t78K1fjHK1yhJVd7IYGwj5VcpEp5YHt1A d+2ZbNPNMPAG1CySsK0LSI/kisjrRDus2hRfpRzitnLGItM8jAVy39XB Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/alacdsp: fix integer overflow in decorrelate_stereo() 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: Abec65gdfsZO Fixes: signed integer overflow: -16777216 * 131 cannot be represented in type 'int' Fixes: 23835/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALAC_fuzzer-5669943160078336 Fixes: 41101/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALAC_fuzzer-4636330705944576 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/alacdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/alacdsp.c b/libavcodec/alacdsp.c index 9996eb4319d..8718d1b6b1d 100644 --- a/libavcodec/alacdsp.c +++ b/libavcodec/alacdsp.c @@ -34,7 +34,7 @@ static void decorrelate_stereo(int32_t *buffer[2], int nb_samples, a = buffer[0][i]; b = buffer[1][i]; - a -= (b * decorr_left_weight) >> decorr_shift; + a -= (int)(b * (unsigned)decorr_left_weight) >> decorr_shift; b += a; buffer[0][i] = b; From patchwork Fri Dec 3 17:19:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31915 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp955424iog; Fri, 3 Dec 2021 09:21:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaPyphlHf6pM9Itsg8cgOsZvo3Q4nqJfJHNcnAT9Knqh5CpTgB0415V+c2xmd9owmbvLOA X-Received: by 2002:a17:906:309b:: with SMTP id 27mr24583525ejv.129.1638552079508; Fri, 03 Dec 2021 09:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638552079; cv=none; d=google.com; s=arc-20160816; b=OmbEMKol0phMaXgV+6aAoW9/K3FEtpHxkUk0pspdjGsxqjUU/Mchfg82z54n3ySxoW WKLwLTxffRjAneU6KVrgEwNgPRVDMxCCtj8uKmcWeH+Gx+daLD9zRfC2XVgS90fulINL dVe2h19aIJM/Q9slTXoPaogT2e6O0vzhfvd2hpET1U25yO1GpyvQMR3rJpZrNnLyK87z fZKlUC0yR4WEzKPlZLwhzrDLrkeBjNQp8SqIRga3iZPKZZmvz0kjT9QlnWU7CpX/E5W5 ygoxLZfWnikq1BuR0GrHuInXos90+Qg+z5Ui5A/wQVz2jPhBV1hi9xtd15mSZR6XiknO CORA== 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=qFqkWiX/B/Z5u7p5dXVNzF/zpQw72XcTsQTTehszJcE=; b=mfX5dksS6sPULzMpKVMTn0RCr+n+DLnd4CdKeMyrKp1Tot5DbXqalFLNOVs1UcNdys Xb4GYALE2fanUO0f5RIvsv3kWWaFZpaFsZig426AHeXmf1GVZnol0hQkqgfTDZN3/aCw 2sydnxeX1fJ8SSzEf6RPBwCqHavG5lG1/stwhsU9lCiJltMQrL8eBjdJO42nshNga/LK Dr1kRZN5HHHrfmd3IL1MhUfDj9qONkB7J1dAIPjJ3xrmR0J1n28HT3fvJPiRQTqB6qgP r7GVYXlgBSAkiCFs8eTrOSLiQjH7FkjmqDP92+bFFPwl+nbm+6g3q//yPuz7rCywCMG7 HNwQ== 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 d9si5411215edo.63.2021.12.03.09.21.19; Fri, 03 Dec 2021 09:21:19 -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 4D5C468ACC3; Fri, 3 Dec 2021 19:21:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8FC368ABAC for ; Fri, 3 Dec 2021 19:20:57 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mtCEz-004eP2-0L for ffmpeg-devel@ffmpeg.org; Fri, 03 Dec 2021 18:20:57 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tCE1m7BkbSgGFtCE1mKbld; Fri, 03 Dec 2021 18:19:57 +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=GKMznlBq5PRTkBPoZmsA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Dec 2021 18:19:56 +0100 Message-Id: <20211203171956.12231-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211203171956.12231-1-michael@niedermayer.cc> References: <20211203171956.12231-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLd6wMgCCOCghu0cFGwb4Qn3hHuNZoAWd8F2exKFbXdj4qKkTDwVOgeH9d8NWgvhv/rbMao0VkCpusG2LR8t78K1fjHK1yhJVd7IYGwj5VcpEp5YHt1A d+2ZbNPNMPAG1CySsK0LSI/kisjrRDus2hRfpRzitnLGItM8jAVy39XB Subject: [FFmpeg-devel] [PATCH 4/4] tools/target_dec_fuzzer: Adjust threshold for HQ_HQA 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: ixgAZA72HX0B Fixes: Timeout Fixes: 41120/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQ_HQA_fuzzer-6327761690558464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index e27c45ddaa5..b862d7a3a41 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -172,6 +172,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_HAP: maxpixels /= 128; break; case AV_CODEC_ID_HEVC: maxpixels /= 16384; break; case AV_CODEC_ID_HNM4_VIDEO: maxpixels /= 128; break; + case AV_CODEC_ID_HQ_HQA: maxpixels /= 128; break; case AV_CODEC_ID_IFF_ILBM: maxpixels /= 128; break; case AV_CODEC_ID_INDEO4: maxpixels /= 128; break; case AV_CODEC_ID_INTERPLAY_ACM: maxsamples /= 16384; break;