From patchwork Wed Oct 9 10:14:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15628 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 267B344921F for ; Wed, 9 Oct 2019 13:22:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E67F6881C4; Wed, 9 Oct 2019 13:22:15 +0300 (EEST) 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 B9ABD6881B1 for ; Wed, 9 Oct 2019 13:22:08 +0300 (EEST) 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 1iI91N-000ADb-5y for ffmpeg-devel@ffmpeg.org; Wed, 09 Oct 2019 12:16:41 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id I90Oifjm5wlysI90PiS553; Wed, 09 Oct 2019 12:15:41 +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=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=EfaNEuAiC44ZH2k_WtwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 9 Oct 2019 12:14:53 +0200 Message-Id: <20191009101454.1608-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191009101454.1608-1-michael@niedermayer.cc> References: <20191009101454.1608-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfA6lTvGLXyRk0Ya1bZ6NwswbxyyqdQkmriJjr9tFNgtymW4HSCjHeytW3ary1FOKupWWRuSSlKDZopV+ndxXvSDm5hN965OkGgpg9iC+L5eSLj0H2uy+ ZZwAnl/Trgc3U/UWW7fA21Yq3fvM3F26/hSN7XwuUXcXOdVRq1kUpcIw Subject: [FFmpeg-devel] [PATCH 5/6] tools/target_dec_fuzzer: Adjust threshold for G2M X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" G2M allows large images from small input and also reallocates multiple buffers on any resolution change. Fixes: Timeout (22sec -> 5sec) Fixes: 18022/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5089192530411520 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 a2c59be318..f3f8d11ab2 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -141,6 +141,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; case AV_CODEC_ID_SANM: maxpixels /= 16; break; + case AV_CODEC_ID_G2M: maxpixels /= 64; break; case AV_CODEC_ID_GIF: maxpixels /= 16; break; // Performs slow frame rescaling in C case AV_CODEC_ID_GDV: maxpixels /= 512; break;