From patchwork Fri Sep 17 19:56:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2511915iov; Fri, 17 Sep 2021 12:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwA4r4njN+3/UQoDacZiDCpBgEPyHKb65ZUxM47+vBliSjijc7kL0GPVQLyR2uBOV2fEYDv X-Received: by 2002:a17:906:ccca:: with SMTP id ot10mr13859033ejb.429.1631908666874; Fri, 17 Sep 2021 12:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631908666; cv=none; d=google.com; s=arc-20160816; b=qqfd8yKcal1BIINS3iIxPb2Jc2qdIuRaJy6nZvgPCmYYoQNnQ8EB8VNQPzuqhqFEHc 7NrHhr/8r5gQ91OO6q1ujESW0RykMw9b6WDHR7ASAhvFzQu80z90O+gXN47Kw0SYlgv7 Xq7PXIKWya2tY880K4E2ST6lGcYPr2eHKUiN5TxBO5/K+XE62/ZtrVgfA9pljEFW6A18 7IdEyELJSLrTjcgZL1v81c7zCBLuGTDnrHoAD8HMV8MaBx+PN/KIwa2l7JU2vCPkrLjq c6ku9CSHxPAQ4d/0WLMoMwyWFD/OjW5BwU8Zx4gk6R2k+Cd+QUM65HmsGtFiZAEwRTH8 P3Qw== 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=hNqPUvzw83bCXY/Qja7V3IgM9Sho23cOfuzFJL0LrrA=; b=FRp60sX4j7fvzALZX8RnoOlcg4iV0e9t+5/jVqAy67b2bv8jTOsj6ToxZ9ynzaEKpM dRvTstidTBUHoClwCFhiCU5qDlNvnrbYD6wBFOk41tD0RDmmkPQqKlUPyq6OVJngH1J8 nI5FlAF5ZZFrkOrHFnppswkMlP0c9SweLzGvIsOcIQw+hwtbvfD8K9A/3G6jAxMr3x+5 aJNSWoY6vAqRp7cXfMWmPvwQ45Vz6c87mjraTF69yAH24CbicLiV4fPCD5rU3jUn6t1X n/Xzc9sMx8U/S4bd7FWUGuAwQSNWoZm5cIYl6Kx5ch9c6dWeXyGHOZLZ7pWo9u90vPb2 TSxw== 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 o11si8472409edz.293.2021.09.17.12.57.46; Fri, 17 Sep 2021 12:57:46 -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 E590468B171; Fri, 17 Sep 2021 22:57:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED5DE68B113 for ; Fri, 17 Sep 2021 22:57:17 +0300 (EEST) 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 1mRJz3-00FXiY-0H for ffmpeg-devel@ffmpeg.org; Fri, 17 Sep 2021 21:57:17 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RJy4m6NUzljeHRJy5mufCL; Fri, 17 Sep 2021 21:56:17 +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=EfaNEuAiC44ZH2k_WtwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Sep 2021 21:56:13 +0200 Message-Id: <20210917195616.25061-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfDRdcJI1BQsvfACCGoj2fsI1m1Eltg9dnbuZkuqeg6uxhms2fhzwoc+L0wAFOY9eNN4qLcKhc3OhQfz30GaWadgRXsuz+zKHCf0g1DdRsRgtdM00QRwe VA3rzx9p+Jh92ooscpkww2yj7Sud4ZxrlzxQr6SMwZvDhu366Nz4vFf6 Subject: [FFmpeg-devel] [PATCH 1/4] tools/target_dec_fuzzer: Adjust VC1 threshold 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: GeebJ21Wyhdb Fixes: Timeout Fixes: 38215/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-6375595299176448 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 d192f7db488..8badbd0b5cb 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -200,6 +200,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_THEORA: maxpixels /= 16384; break; case AV_CODEC_ID_TRUEMOTION2: maxpixels /= 1024; break; case AV_CODEC_ID_TSCC: maxpixels /= 1024; break; + case AV_CODEC_ID_VC1: maxpixels /= 8192; break; case AV_CODEC_ID_VC1IMAGE: maxpixels /= 8192; break; case AV_CODEC_ID_VMNC: maxpixels /= 8192; break; case AV_CODEC_ID_VP3: maxpixels /= 4096; break; From patchwork Fri Sep 17 19:56:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30314 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2511705iov; Fri, 17 Sep 2021 12:57:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmUwYTeaiaGnvokhq4j/yzRwKRGetqjdOqnzOYxRijfPorjKMWffBhr8h1aA79gsgAL6J3 X-Received: by 2002:a05:6402:13d0:: with SMTP id a16mr14209420edx.155.1631908649810; Fri, 17 Sep 2021 12:57:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631908649; cv=none; d=google.com; s=arc-20160816; b=cOp8aKxbGk+d+rtZd/YH3nIQLmUdJuptL9IKq7pKurwhaKynFezitQ7Jg7slp7TcrA AOs/886jBEEVwfjtfof4POXDJqcQI+q8Gb3+OoOTfhrLJ5i5rJ7Ji3tV/4bXiQZ4CXCp PLgaUEhP0vRi6Ye/vHQqLwNSDdkZXw1E8PdI1q/FDmAyD+RLJchtd+4GZowbDb6o/Nio MrsED+L4QgY6Y0GfueqJ0oPpU4bNMvMsX7xgQc351SUUqwToSZK+p73zJIcUniPX75KV 9ULB0hvxh+HfFHZA4/PoG70gVfsCyuy/380QKuTbAej/wKinZjOwSxU5OEbUwuFNv2OJ X9kg== 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=d3XloaaDkdfRb5TaSbRKTxGXMJ4tGCWJUwh5BEol0zA=; b=v8faId/PNPG8HtKOwY9tfagVkNFw7ZT36UCiYsICqFuyS+KelzlB3MojzMzShXh2EM bsCR9Kv6lVb/O4CD1eBr1aq4wq86RJLp83JLNAJMEK/Vcv3UI3MEAERHReZgDHntmwqe CcCH0wQmWjsBXpdnbq6fEE1IOVwJCZ4BbEHQpQAc/IVDIEOO4s7mNHoaopNc4VPRKpNg rUfCju2ipyLZ0D18El8Sqhedk+kPAk12tP+GAfS/e3Km0gE9a9O5HruvW769yWU6hBge K819RRyHn6iabnIWB93AywvAGG669DnUwzy3y4m/KGxMZWLIS3QAht2BPfR927SnFd0v 89EQ== 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 m12si7624384edd.470.2021.09.17.12.57.29; Fri, 17 Sep 2021 12:57:29 -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 0608868B0A5; Fri, 17 Sep 2021 22:57:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC2B9687F99 for ; Fri, 17 Sep 2021 22:57: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 1mRJz3-006Up7-0G for ffmpeg-devel@ffmpeg.org; Fri, 17 Sep 2021 21:57:17 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RJy5m6NWMljeHRJy5mufDA; Fri, 17 Sep 2021 21:56:17 +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=RQ6tB2hilBNp_P6iCXgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Sep 2021 21:56:14 +0200 Message-Id: <20210917195616.25061-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210917195616.25061-1-michael@niedermayer.cc> References: <20210917195616.25061-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDRdcJI1BQsvfACCGoj2fsI1m1Eltg9dnbuZkuqeg6uxhms2fhzwoc+L0wAFOY9eNN4qLcKhc3OhQfz30GaWadgRXsuz+zKHCf0g1DdRsRgtdM00QRwe VA3rzx9p+Jh92ooscpkww2yj7Sud4ZxrlzxQr6SMwZvDhu366Nz4vFf6 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/dhav: do not use zero fps 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: gjo5aRt+jNp6 Fixes: assertion failure Fixes: 38332/clusterfuzz-testcase-minimized-ffmpeg_dem_DHAV_fuzzer-4522405595316224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dhav.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 5ae39a2a64c..f67b0b89ac9 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -315,7 +315,7 @@ static int64_t get_pts(AVFormatContext *s, int stream_index) if (diff < 0) diff += 65535; - if (diff == 0) + if (diff == 0 && dhav->frame_rate) diff = av_rescale(dhav->frame_number - dst->last_frame_number, 1000, dhav->frame_rate); dst->pts += diff; } else { From patchwork Fri Sep 17 19:56:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2511801iov; Fri, 17 Sep 2021 12:57:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyK5Eku8WkSEbhhfApAZBTX5j2CUlg4S513Al+DssvIeFWt2PYco0bvkwLb/MTTTeT8G/S X-Received: by 2002:a05:6402:19a7:: with SMTP id o7mr3726937edz.360.1631908658634; Fri, 17 Sep 2021 12:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631908658; cv=none; d=google.com; s=arc-20160816; b=KkD64UgK7G8hEKFyY6sTrUNIyx9GNn3XNrTEiY416BVQSfmyoJHmqajF+WRL+o9L0J N69gGzaf6JMsjx7NLHl7eqErFx79zpysEHrabsMJGJ6sMsObHFKOnNhLAjfeLeDhbhpW 7R+13oPwdumPgRzuwrLtMsuZnpVy40twqQ9npZNDaHlGGe0YtSajl9H7yAysgLicZscH N7Ok1CCpakdf2mJyoydgF/Zaa69vzxbE2u4LkW47XTAzUyRHMUkP/um0qpqFin/H3X2t 3lZH487dT3JusvCXkLnYobn9NXzkkHWlhKEXagbOGeqJv0Yj0y246+H/ViSZKkD+I5yL j3KA== 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=gt0NOH/4FQS8CsT4MsPeAdBXo1CxoW62Th5lYLVnKbg=; b=UrO8WUQrSjxWOQ5HKSJnSPuFEnzfPaGQ2O0elNoiAD8oD0pU/bhpVnuVouLdQCgCgM /BqcmOI9L+U83Zs1aeFXPu5UsunfCy/V3JALzQQM7nvZod3kJqMeCDltNhBpwSQ9jq91 ffI2/We4CwIeq+/AIAsmJcOFqf2aHDmzPVqLJvs02LyZGITqzZTmuwdIKtpxIKAmTo5U ORQ4xTngVQF0SGGui74ffOA3fAM/j1WWTM5tIQTmMaWwd2wXCO7G9YmH5qjuq9WLG8W2 Q8hY2FlJiSz0N3Otcy9/5jfh+uNSuzIqWyYaK3r+auUpD6bfqQzfMPnptZ7wpbGZ/7jg j9eQ== 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 ne41si8062909ejc.565.2021.09.17.12.57.38; Fri, 17 Sep 2021 12:57:38 -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 12AE868B0F3; Fri, 17 Sep 2021 22:57:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC94D68B0F3 for ; Fri, 17 Sep 2021 22:57:17 +0300 (EEST) 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 1mRJz3-001Z3t-0H for ffmpeg-devel@ffmpeg.org; Fri, 17 Sep 2021 21:57:17 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RJy5m6NWfljeHRJy5mufDM; Fri, 17 Sep 2021 21:56:17 +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=42JJjx2Omx0aMyeJof0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Sep 2021 21:56:15 +0200 Message-Id: <20210917195616.25061-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210917195616.25061-1-michael@niedermayer.cc> References: <20210917195616.25061-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDRdcJI1BQsvfACCGoj2fsI1m1Eltg9dnbuZkuqeg6uxhms2fhzwoc+L0wAFOY9eNN4qLcKhc3OhQfz30GaWadgRXsuz+zKHCf0g1DdRsRgtdM00QRwe VA3rzx9p+Jh92ooscpkww2yj7Sud4ZxrlzxQr6SMwZvDhu366Nz4vFf6 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/apedec: Fix integer overflow in filter_fast_3320() 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: 7BJsz5rg229l Fixes: signed integer overflow: 2145649668 + 3956526 cannot be represented in type 'int' Fixes: 38351/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-4647077926273024 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 050523601d5..27d0ff35655 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -879,7 +879,7 @@ static av_always_inline int filter_fast_3320(APEPredictor *p, } predictionA = p->buf[delayA] * 2U - p->buf[delayA - 1]; - p->lastA[filter] = decoded + ((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9); + p->lastA[filter] = decoded + (unsigned)((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9); if ((decoded ^ predictionA) > 0) p->coeffsA[filter][0]++; From patchwork Fri Sep 17 19:56:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30315 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2512033iov; Fri, 17 Sep 2021 12:57:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVU1iwEEAw3NebU5+fPerHqjGlDq0wI0MIUvYLasg4guBF3e7xOVgEUeOTEQ+ctlVi4fys X-Received: by 2002:a17:906:689b:: with SMTP id n27mr14921908ejr.459.1631908675964; Fri, 17 Sep 2021 12:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631908675; cv=none; d=google.com; s=arc-20160816; b=rcf7WiWItS0jVcOa1BJGzgwd+TSbqeGozs1bpuqDQScCPabNK67Hoj+t4E/dzM8hf8 hc3SPuP+cSSRLr8Ccw2ReTcgVFywshltqCC7f/ka7oWVoiktDuh15J9BvhDT+oXLfCqE T9lSKYiWdD/jq9BmqGfyviGmCTBxFF/w3BMpeLUYjoCi65mCOW2d92Ugl/Z0W5sjwNTJ xiWbd11qvtYSQZLj30dtdMLjh5wwDKuMKVFy4aXB6r8GuHmnrUR9IolgH28Wz2AURmFB D2pBz9UhgGHYCAKVpDWyyfrclU8mOHfFk/yp0t8hwoJTdP1U0hyxxViOyGZwZFud0x4e BvMw== 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=Z9ZL0v3un+VSNIAyIBFS1dUphmEK/+n2ljnGvOqAMj0=; b=lpDIlAa+grOkOoYZWxRV+yb/49rKooqnLgLKapXBIViPAKl5LUES1kkMXc3PuD83CM jRSAowks4zfuPDAVTB62yFHeGFI/ikXJIKygicSZs3fCIdMX/u5WTkjVXcMRikuHdIoA UHlDFcSzNz5knFfD3kHzt2iZjZqOb22eW2rPo9/70lIXPloUcvino59AzttsDkWJ1Yh/ dJUvOCU+n65/IMYTe93Y3MbrnEwzOIpB45pCpsaTxsFTf7XLy55XZZUnK0QSggwHv1aS BrdVrLINWsCVZnqxf69gyA8q/6dqrwL5HRcyYlKlrcXAqyoARYki6192JryyHdAImy26 mbyg== 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 m17si8293788edf.618.2021.09.17.12.57.55; Fri, 17 Sep 2021 12:57:55 -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 CA1CD68B113; Fri, 17 Sep 2021 22:57:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDE6A68B124 for ; Fri, 17 Sep 2021 22:57:17 +0300 (EEST) 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 1mRJz3-00FXiR-0H for ffmpeg-devel@ffmpeg.org; Fri, 17 Sep 2021 21:57:17 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RJy5m6NXEljeHRJy5mufDk; Fri, 17 Sep 2021 21:56:17 +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=cA2QCgbgw0K0SCkeVIcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Sep 2021 21:56:16 +0200 Message-Id: <20210917195616.25061-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210917195616.25061-1-michael@niedermayer.cc> References: <20210917195616.25061-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDRdcJI1BQsvfACCGoj2fsI1m1Eltg9dnbuZkuqeg6uxhms2fhzwoc+L0wAFOY9eNN4qLcKhc3OhQfz30GaWadgRXsuz+zKHCf0g1DdRsRgtdM00QRwe VA3rzx9p+Jh92ooscpkww2yj7Sud4ZxrlzxQr6SMwZvDhu366Nz4vFf6 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/siren: Check index for catergory5 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: u0OxGLQkmB+X Fixes: out of array access Fixes: 38603/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSNSIREN_fuzzer-5741847809490944.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/siren.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 2161b29a2cc..7f2b4678608 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -648,6 +648,10 @@ static int decode_vector(SirenContext *s, int number_of_regions, } coefs_ptr++; } + if (i >= FF_ARRAY_ELEMS(noise_category5)) { + error = 1; + break; + } noise = decoder_standard_deviation[region] * noise_category5[i]; } else