From patchwork Mon Jul 4 22:30:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36664 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3097106pzh; Mon, 4 Jul 2022 15:30:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t1zwWO0wySz0K/tb55QgUm0pRgB/XtFNbnReqvYZh9/uYK0Q6/ZjwXLGYPXJaSYHFBAbeU X-Received: by 2002:a17:906:845b:b0:72a:4dbf:82e6 with SMTP id e27-20020a170906845b00b0072a4dbf82e6mr27801315ejy.149.1656973847238; Mon, 04 Jul 2022 15:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656973847; cv=none; d=google.com; s=arc-20160816; b=rTHLYOv16VzHiY6RaXCzb3crwZ9Mj2akbPMtshNXQpuMur862tKnsvRNAhv/nV5VWu WEQyudceHxZqn9U0jD8Qp/Vy9t5tR9sU1OVAlke6JXlPrWRprMqgnaTW+poFRUp7u2cD nVDYsyZ2Zo26xrpuHEHaiHvODbTX8+v7JCt2bR4oMqal9dtfaYPkerk84AXuBBeMiQ2l CU1VxRlzLadP7Hc165Ur2ax3l9g2P988qPcS8eLLJJclMabeKI7luoaQ7xFA5flTwXOX LORs6DSqTaiUO2Rd/rXoOrLNvpCUKjx3d87fpDL+MOAYLVZB7yOc9/ZUlqxr/djlwDw1 jrNg== 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=j/ErAXoBLr/hgUzyJeb0yLm7vbBp9A1IckJzHtY8CzY=; b=RHDe20uUqtcErG/SqqFHNxy78ey9VqSGnQbUk50AAKKAirnzt9pMMVFOkU9SyreSkI UFcRiLD267REbGtk/KCKu3pXsHxfU7asxy+oBqTV2YAo5UbS3y8TLHqB5pO1iv1o14Xo wb330NmWgP2O87qiwddTbxD8MQoI4oXCkfvj1JIkfL6riZyr0IUyQK1h9YEYNn9bRLCV ecDB7tt7e1l88iyqZSPkYkCTvU/36WW0ppeFjp+6cF9M7fMm9qtkiA9Plmq4KndzeFov Nca9oHOnZuYO9BdMELyJin+2zl2yMGDMTxtv8rNgOxESkvX7wtuvG4BPGhke6bW52FpJ rqiQ== 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 ht8-20020a170907608800b007262a166933si11125730ejc.165.2022.07.04.15.30.46; Mon, 04 Jul 2022 15:30:47 -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 A8C5D68B920; Tue, 5 Jul 2022 01:30:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7C5F68B7F9 for ; Tue, 5 Jul 2022 01:30:36 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o8UaR-000S3d-Fe for ffmpeg-devel@ffmpeg.org; Tue, 05 Jul 2022 00:30:35 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 8USzowQIx8s8U8UaRonO3x; Tue, 05 Jul 2022 00:30:35 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 8UaQo9RoA8eSW8UaQor0he; Tue, 05 Jul 2022 00:30:34 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62c36a0b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Bo0f08LfGbP_b1ItLNsA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Jul 2022 00:30:32 +0200 Message-Id: <20220704223034.15056-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJYmTzC2vBLCPStCBgEWa4f41aKWpUAmoRALARsd7WMAdmbEFvDES7vn/UMmKYNkVNhSzQDcin0IYl+TgodQN9jhMf1ihlaMukiIRxe33BxJxopYL2D1 bsgDueUrOk8jsFlMMfHpBSB98pfuBo1h2u5qXZH2uWUFYKmjnsUeK6GF4vGoJZ7QGe/lEQTHMMWxZA== Subject: [FFmpeg-devel] [PATCH 1/3] tools/target_dec_fuzzer: Adjust threshold for CFHD 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: kcMOXc3guX9t Fixes: Timeout Fixes: 46504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-6376835606249472 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index fefc8514f0..9a4e2136eb 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -211,7 +211,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_AGM: maxpixels /= 1024; break; case AV_CODEC_ID_ARBC: maxpixels /= 1024; break; case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break; - case AV_CODEC_ID_CFHD: maxpixels /= 128; break; + case AV_CODEC_ID_CFHD: maxpixels /= 16384; break; case AV_CODEC_ID_COOK: maxsamples /= 1<<20; break; case AV_CODEC_ID_DFA: maxpixels /= 1024; break; case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break; From patchwork Mon Jul 4 22:30:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3097489pzh; Mon, 4 Jul 2022 15:31:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t2NSS0chc+5YL3Ec2D/swxBe/FaZfk+etzj+UUe2axwDFyMGrBzG6OFskD+dyAuoNt3y74 X-Received: by 2002:a17:907:d89:b0:726:9d87:e4c0 with SMTP id go9-20020a1709070d8900b007269d87e4c0mr30529809ejc.216.1656973903388; Mon, 04 Jul 2022 15:31:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656973903; cv=none; d=google.com; s=arc-20160816; b=R94TgjSTYL7iV24l+16vrO+4VAMWJxdhGDzRCJbW6Xybhna3N1PZwI5wqY6QEO7GlE IOwb0alKtGf8JiiI0AoS4/6eHEfvqpS2r2ODO6uCoQTRTZF0/v7qLjGDip/jJvCbN3mO q4HjBaw7/CinHt7T6EJMJYjKNFTCegpmEbF8sMpzMxtnCYFcr3HsVk/bz8iApCHhVqbl gR1cCW9WZ4610LMC7dYx2x0FEG+K7cduujvaHu8inCwEwyS9drDcAU59LvOF5L5muAeS CU8SA101+7tHwVujlSXM1oiL8WYU7c6RMseg8HacNdEEcUl5OId5LWXmSs5VmOgf3s7I jVdQ== 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=2gdyGsHEiydex9t3emqCcRY2rdoNLPOpMhdsDUwxl8k=; b=Tu4RhQPx3ptwGrmKN+/ZpYqLdd8EK2kj9Dsus84Erha8ajLSUFxamZpvmjgTylVtxd atapH3aytxljVdgc+NBVCuqhjOvMKfn5ltD01saP/zaDsL6Qx3vaA3oveaMWqost1ZGc kZWiy5UPtt/TlS796DbgXRmXlghi9hgMTooo4FLJcObk8NUjtOaOedib+ANgk/wZWMjy D3GpOwQmTG/qp7+tosNOcJycMQi2Re3JolUcYqZvLpzcG72TKwByyeRO9q1OLRtkY7ik t79kXA3JlwejxtRpFPtAcTWqvzgATiGweelb4GMDDpfH5VXeCTpERH8rtQoo7YhhaR4D gbKQ== 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 qw7-20020a1709066a0700b00709521d4b92si16789558ejc.397.2022.07.04.15.31.43; Mon, 04 Jul 2022 15:31:43 -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 310EC68B92E; Tue, 5 Jul 2022 01:31:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7109368B7F1 for ; Tue, 5 Jul 2022 01:31:35 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o8UbP-000MRr-2D for ffmpeg-devel@ffmpeg.org; Tue, 05 Jul 2022 00:31:35 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 8USzowQIx8s8U8UbPonOFw; Tue, 05 Jul 2022 00:31:35 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 8UaRo9RoW8eSW8UaRor0hh; Tue, 05 Jul 2022 00:30:35 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62c36a0b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=7s6rQYwckFRIa4cbdNIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Jul 2022 00:30:33 +0200 Message-Id: <20220704223034.15056-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704223034.15056-1-michael@niedermayer.cc> References: <20220704223034.15056-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF/kLOKFloNSJFszvWJX8eDMlKjZKETUoR0TjjJKUPDDr6/uQOwyKzT9ZpXAj+wjz2B/IGObfRD6nMmq3Ykw9IMdsUMLWW/0cc+rI2xwX2+9oPLDTJLj Ew4GHLxxbnY7S2IbEkofMMdx8RNA6aHfnHbYHrcPyczBglvOoFUMFs2MTtTCMG0+39/CP3l2UQ0Omg== Subject: [FFmpeg-devel] [PATCH 2/3] tools/target_dec_fuzzer: Adjust threshold for MVC2 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: FP4Mpwb23C7B Fixes: Timeout Fixes: 48689/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVC2_fuzzer-6436301427048448 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 9a4e2136eb..adafc977e4 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -245,6 +245,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; case AV_CODEC_ID_MSS2: maxpixels /= 16384; break; case AV_CODEC_ID_MSZH: maxpixels /= 128; break; + case AV_CODEC_ID_MVC2: maxpixels /= 128; break; case AV_CODEC_ID_MXPEG: maxpixels /= 128; break; case AV_CODEC_ID_OPUS: maxsamples /= 16384; break; case AV_CODEC_ID_PNG: maxpixels /= 128; break; From patchwork Mon Jul 4 22:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3097165pzh; Mon, 4 Jul 2022 15:30:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uZaBc/aItfcskEVJo6PYJBInFG7ocqpRoWW9Ec6Z+qAHOzqbcLSXWlwAzox7DSEmK6guhy X-Received: by 2002:a17:906:5a4e:b0:72a:605a:57c3 with SMTP id my14-20020a1709065a4e00b0072a605a57c3mr24761297ejc.301.1656973856518; Mon, 04 Jul 2022 15:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656973856; cv=none; d=google.com; s=arc-20160816; b=aAcNIOf+zd3I3kyUZ2QuS5TuXq+JzxmVK6fF9/jsVjwoQEgMTyq3BWrkEvGB7K1J4/ KC8ZJG7dgry3w2dyYM7ZU1KLx1TpTp+yZWlI4N5sxcWgpEZjAiC+3eRhrpyseocEVfmG NAkqriUZADgr3W0SRPkQD91S9TW++dVN13Tm5Zu0sbpd5rngTnN/e6VKuTRsvSiDXjsP NUCzsAtw5yo8gZWFhv4TUtLmhuE/O2r7b+INcNgqIH4RIbJ0bD3kxLdpFtfdFMKxoLZ8 PvQRRcTg0392u6bP9YQinGcICw8lJZcleLHoF4o3O58UZf6BrLlwjVR2Ywg8CP8F1N3m Npmg== 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=AecBssBDbur9RJLrzOH6oLW6W0V2xruDo4HKS6MPJH0=; b=fW3ZQXSmVq7sh53sVoLyvo/0NFmX8apmRN0u9+t/DAo4iwoK0VmDq3CoU5v5tDh6D0 DxXs2UkAt4FZHZzHJduefsfvoPgwNGwB/gZvx38eLlSIkwDa1lD61IhfXgbNePewg9Mv MVpAH6sayAI9YXZ0dL4Cpegsaw74I6CwyHGXyQAo0Cq0FBMMOxpH7SfNHSCHs1iJHbIE h/3eqDGcRCFlwi/bup0WDfYisDq2SR8hTKvy/+6vrEeYP2Y7j4/Iu2JnQO02l9IefHA7 M4aeTTU66kyCuNhH3OtAV4KqQIuQhhz+Tq2FS8AxpCtoUBbH0QKnWS0fwPojoFsnPw3P rPhw== 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 f20-20020a056402355400b0043774af6f0asi27482483edd.371.2022.07.04.15.30.56; Mon, 04 Jul 2022 15:30:56 -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 D77B668B931; Tue, 5 Jul 2022 01:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9A7A68B804 for ; Tue, 5 Jul 2022 01:30:36 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o8UaR-000MRs-QJ for ffmpeg-devel@ffmpeg.org; Tue, 05 Jul 2022 00:30:35 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 8USzowQIx8s8U8UaRonO43; Tue, 05 Jul 2022 00:30:35 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 8UaRo9Roi8eSW8UaRor0hj; Tue, 05 Jul 2022 00:30:35 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62c36a0b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=55yFLhZSyP6QP7fv7yAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Jul 2022 00:30:34 +0200 Message-Id: <20220704223034.15056-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704223034.15056-1-michael@niedermayer.cc> References: <20220704223034.15056-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJYmTzC2vBLCPStCBgEWa4f41aKWpUAmoRALARsd7WMAdmbEFvDES7vn/UMmKYNkVNhSzQDcin0IYl+TgodQN9jhMf1ihlaMukiIRxe33BxJxopYL2D1 bsgDueUrOk8jsFlMMfHpBSB98pfuBo1h2u5qXZH2uWUFYKmjnsUeK6GF4vGoJZ7QGe/lEQTHMMWxZA== Subject: [FFmpeg-devel] [PATCH 3/3] avformat/iff: simplify duration calculation 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: okwPXtzN2kRs Fixes: signed integer overflow: 315680096256 * 134215943 cannot be represented in type 'long long' Fixes: 48713/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5886272312311808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 3c861ef34d..b37600605a 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -384,7 +384,7 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt) avio_skip(pb, 1); pkt->flags |= AV_PKT_FLAG_KEY; pkt->stream_index = 0; - pkt->duration = 588LL * s->streams[0]->codecpar->sample_rate / 44100; + pkt->duration = s->streams[0]->codecpar->sample_rate / 75; pkt->pos = chunk_pos; chunk_pos = avio_tell(pb); @@ -397,7 +397,8 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt) case ID_FRTE: if (data_size < 4) return AVERROR_INVALIDDATA; - s->streams[0]->duration = avio_rb32(pb) * 588LL * s->streams[0]->codecpar->sample_rate / 44100; + s->streams[0]->duration = avio_rb32(pb) * (uint64_t)s->streams[0]->codecpar->sample_rate / 75; + break; }