From patchwork Sun Jul 3 00:31:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932775pzh; Sat, 2 Jul 2022 17:32:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vgvZctSF6cUyDsdAxczb3HDMSzc430RmYRmR2rkDj0b8aGosTuIFw1S/RXDX61uF7sZFpW X-Received: by 2002:aa7:c1c7:0:b0:435:5cb2:c202 with SMTP id d7-20020aa7c1c7000000b004355cb2c202mr28426714edp.10.1656808326777; Sat, 02 Jul 2022 17:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808326; cv=none; d=google.com; s=arc-20160816; b=AHjs70CV40dd47iSJnBD21F8xhz/JoebktLW/ZnHQsryhxLWly8KlQH3L2DZXWYIcK +A2LcdG6drROh62PuhqkY24XU5sGEmyUcdzA8QMfNJBt/cbIP4g5ivTv5yxOt+bh8CnY 4QmYzKh0D020s5tDIJjO1D2hFaEEZESSdQetbsWo0UyElKM/ZiwPiPEXZwWkQeUGJVoH upTGwbGQ/1zxsfIOwRDCq1ZZHAo2g96HU5l8dg6psrpT0GwSw3VZx6OhdZBNcVJKGtBS lT8QhW1uU2OzIqL+ebAlOb6wZoPBXCNe9WGX8bt0KVZlW9fZuK2vlY8m4aHjVXu/7s5v yceg== 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=47YwjzgR1bGgxUEgeD2/J0fI1Gzo+9rgNZHeA9Aff2s=; b=0L0AU28DGZKu5lBx9mMze2LrPFZnx9Jvoei2aKr9FEJ7KLpMppDLB4i5ZUp0Mp0F/N 2w3/IwdQK0LcVw5RuURT2kCdjLtiraplooRWA6lM/uBmISiOZtbqvHx/xdMUK+lTSxYS oEJAEJN4UGgT8Qpkks1Rei2M2whqTZiSLwINFWl9sHBBiT1IpOWVmFJ39c34AY/fQGXS FXzxzTVnE2wpmplSZpij1B3s8HiEbdoAM6bWnBXWDPS7W5YA0Lyb9wVkfrZpxIJzGtup Bn0scBaJ3Z5YDN0TXU8LUd0pC79jyCgjwmm7vvXHNXVKNiy/+5kkJ4cs+twa7SlHyHWu G9rg== 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 o5-20020a170906974500b00718ccb0a170si4680949ejy.87.2022.07.02.17.32.05; Sat, 02 Jul 2022 17:32:06 -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 D91C868B924; Sun, 3 Jul 2022 03:32:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FD0D68B8E1 for ; Sun, 3 Jul 2022 03:31:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o7nWk-001ji2-4L for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nWho2w3E8s8U7nWjodIRp; Sun, 03 Jul 2022 02:31:53 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 7nWioo2OZOPqF7nWjoC2pB; Sun, 03 Jul 2022 02:31:53 +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=OcX7sjfY c=1 sm=1 tr=0 ts=62c0e379 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=TQ5DZgt3K1Glose3LdIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:47 +0200 Message-Id: <20220703003152.17850-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01s7IWuvDFWyeTvjkQT9k3IHYsASLfrOxjNejhV6A4FZIzta3wwyQjlYqLqSV1hA9K6QUNCCrl V/Egy8bYp4FvJYh3OAOToqwhUjhitmR3HDX3j+rBjEpBtKfLGCyl/5u5HrJhBD1VOaudnoxY4sO0KA== Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/wnv1: Check for width =1 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: 797ieXJa6NJH The decoder only outputs pixels for width >1 images, fail early Fixes: Timeout Fixes: 48298/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WNV1_fuzzer-6198626319204352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wnv1.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 0cf2181a48..f1223493fe 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -129,6 +129,9 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_thread_once(&init_static_once, wnv1_init_static); + if (avctx->width <= 1) + return AVERROR_INVALIDDATA; + return 0; } From patchwork Sun Jul 3 00:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36622 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1933084pzh; Sat, 2 Jul 2022 17:32:58 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sa8oPhoS7HsOkTzJv4NX10aio/V0TAz9Rh1XDu4NIxawC7aJ5wVyhHO4BmIIq+to0rGRk6 X-Received: by 2002:aa7:c14f:0:b0:435:7b75:fd06 with SMTP id r15-20020aa7c14f000000b004357b75fd06mr28569989edp.352.1656808378586; Sat, 02 Jul 2022 17:32:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808378; cv=none; d=google.com; s=arc-20160816; b=XVXMorf0/Qcxc4U1idTBR6ydco65oRphUaCaL+j3R+KbiNnhNCFp9M0NVcaddn5SLE +tzj+/HnRsDzMQWYLfA3CXHEcuvT13z4rpY3aCJRytE2jldQGliH0UX6a27f1mwtTAcd wfyBixY9C7pjyREFSX4aDPpshPVCmoPdE9ffVPwRMQ0M5ay/LQaMjNf0XdUDje4/Mgw0 DQfFRFBxdCfquxnmjT+y1edkbxMwUB2GBbg26KeeKsziOnBnipd91DGsBShFSuPZrVHX iypMJJVP2oKeyDFu++GUn9/LzCypBoxnSwNRuObR/OIWxiAPk3gkGkP43hPuhpcT3Jm+ m8MA== 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=5uA8PgwG5WsZJOHUrQO07+4DtuNAC0OdpqT947TVcbo=; b=b5sipoIstaKEhFI6v1oPr81OMRh0lqYNl2bC+kQuhjjuLj5NAJ2LqaSM6jCwjbYIIP 9j6aXJkAZRXwf42UtTmUL7lbQZRISs6GUXtWcDiPG5k7yyBDOUgckd5sNDoM3NhULlME ctp1yWSN5ExTnR+TLHtqfj2xhn0f32qc70V7bBtSTpzi6Lz7Et4Fc6EJdJk7J9zCBE6P XQjGpJ+I+86hBMFzEZzC+hUS4ycnQnoTL15ZS28aCpTXCQLKE8kgawLeaA1UUabeMvKf 1UNqwsdpEhr5yHAj5/k0SaT5Csp7OMkmIcsP8vCb9gB/RDlAySB8BNmW6HZ1IC3ez/5L /MNw== 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 w8-20020a50d788000000b00435738f4569si8197605edi.195.2022.07.02.17.32.57; Sat, 02 Jul 2022 17:32:58 -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 577F568B9B7; Sun, 3 Jul 2022 03:32:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74C5268B93E for ; Sun, 3 Jul 2022 03:32:53 +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 1o7nXh-007KZe-1C for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:32:53 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nUxo2thH8s8U7nXhodIds; Sun, 03 Jul 2022 02:32:53 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 7nWjosU8y8eSW7nWjooHQR; Sun, 03 Jul 2022 02:31:53 +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=62c0e379 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=vsNmR7GrC5s1ARwY_z8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:48 +0200 Message-Id: <20220703003152.17850-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCq14tZdMDGrJzDIzJfTrCzHNgks+BKVUGqKjbvqXj1SeuYoA45p7jQDMudK7ynZT6nw+SROCeDEdpbIHTGfb471dQ4kTy6Y5jPm3VMl0SlLS55gFHob ogppiDB54S/F4Iu9GjeeLKQAF4nE4k2+Q0gaqaH16CLalwrtR2X/VGX5X5amB8OfWX4b1SECWbOqbw== Subject: [FFmpeg-devel] [PATCH 2/6] tools/target_dec_fuzzer: Adjust threshold for WCMV 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: AeVm3ERTtNGe Fixes: Timeout Fixes: 48377/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5053331682230272 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 fefc8514f0..8bdecc508b 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -275,6 +275,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_VP7: maxpixels /= 256; break; case AV_CODEC_ID_VP9: maxpixels /= 4096; break; case AV_CODEC_ID_WAVPACK: maxsamples /= 1024; break; + case AV_CODEC_ID_WCMV: maxpixels /= 1024; break; case AV_CODEC_ID_WMV3IMAGE: maxpixels /= 8192; break; case AV_CODEC_ID_WMV2: maxpixels /= 1024; break; case AV_CODEC_ID_WMV3: maxpixels /= 1024; break; From patchwork Sun Jul 3 00:31:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932947pzh; Sat, 2 Jul 2022 17:32:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t0NpkegXj7Smwp/HE7oW9XzQgLxKl1uh0CiqJzIugPxwuOL36cStZu2Xi93reNw1FppFPA X-Received: by 2002:a05:6402:3224:b0:435:80fd:333 with SMTP id g36-20020a056402322400b0043580fd0333mr29147681eda.76.1656808353970; Sat, 02 Jul 2022 17:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808353; cv=none; d=google.com; s=arc-20160816; b=FE73gYESY/NB0wEhSqCsONLGHCXgudtdjNVa38Uotxz4vKzPPTSM/jAfaTAjnCwJBa xdlYgK4uv0GnjOXLrlf/UDyXSRoFwNz34PDuo/ZnZnOF12DWlVcythv9s9pQYtSfWGeI wyyxNc5z1B/OmXXYSpI/cNdfDJoqv5+nRqHcB2tOLsjIJ+drx0p6gSvSfFrnCXWLRYSH MCINH4izCiQ4ijeZJ4nYwZ1D3CssMoXIalMN9p/Edky8g0CV5irnwMMEYODrNNNtyRfV 3ywgTJqPtRy6PoGFcgWpveZvvAuFsXwXynyiwckcq/MO1eB8uURGD3ZazJ7Oh9ZAEKKE H8UQ== 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=J7gTbR2k1PTc+AKocn+oT6ndJIm9xrJLN9LGtqYNH3U=; b=bR8nbS3bbzn6+rUuHbdVMCZuDlPAhtQ3dp1d4CChsTsymqphVKNsAvB6PEVIPuhnkZ lMuVYl585PA9E7d5KfUyfKtNjm65dAEBiUR4pSFBqDOgHYBg5sRibNoEcMQGqEFdk+tJ OSJCvnelY2uJFQLzRCap93PQZVjOVOTlzKw9RIP841FC/hNt3EYvgLDZMioJM0fEnYkd A09LfaD4gV9ZVqRL/qUqBnMjOj+WIvGIbbhC+xKjf2KZl3YiWp3hWpPfElGzhUip5NUK gtNxxDThZiVm5nERuVaWTJxlDUdxTetQ3pSW+UGkrn8vibVjTiGaJ/NcJMsf59rluVEy hr4g== 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 d6-20020a50cd46000000b004396de7fe60si2791799edj.270.2022.07.02.17.32.33; Sat, 02 Jul 2022 17:32:33 -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 328DB68B98B; Sun, 3 Jul 2022 03:32:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B59568B91A for ; Sun, 3 Jul 2022 03:31:55 +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 1o7nWk-007Kcf-5T for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nWho2w3A8s8U7nWkodISE; Sun, 03 Jul 2022 02:31:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 7nWkoo2P8OPqF7nWkoC2pG; Sun, 03 Jul 2022 02:31:54 +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=OcX7sjfY c=1 sm=1 tr=0 ts=62c0e37a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=N9NeYqRwPDIubM9dBHgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:49 +0200 Message-Id: <20220703003152.17850-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01s7IWuvDFWyeTvjkQT9k3IHYsASLfrOxjNejhV6A4FZIzta3wwyQjlYqLqSV1hA9K6QUNCCrl V/Egy8bYp4FvJYh3OAOToqwhUjhitmR3HDX3j+rBjEpBtKfLGCyl/5u5HrJhBD1VOaudnoxY4sO0KA== Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/mss4: Check image size with av_image_check_size2() 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: ZxRFzEfI+2H4 Fixes: Timeout Fixes: 48418/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MTS2_fuzzer-4834851466903552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mss4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 9f3c4a593d..43eb1025aa 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -26,6 +26,7 @@ */ #include "libavutil/thread.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" @@ -477,6 +478,9 @@ static int mss4_decode_frame(AVCodecContext *avctx, AVFrame *rframe, width, height); return AVERROR_INVALIDDATA; } + if (av_image_check_size2(width, height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx) < 0) + return AVERROR_INVALIDDATA; + if (quality < 1 || quality > 100) { av_log(avctx, AV_LOG_ERROR, "Invalid quality setting %d\n", quality); return AVERROR_INVALIDDATA; From patchwork Sun Jul 3 00:31:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36618 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932832pzh; Sat, 2 Jul 2022 17:32:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9DbnEzp2/m2lQs/XqKZp7zqIereswbJLrAEwAA0Ws31gvnXwjRbLcYmq+XoSq0LqLKxYe X-Received: by 2002:a05:6402:e9f:b0:435:644e:4a7d with SMTP id h31-20020a0564020e9f00b00435644e4a7dmr28604152eda.114.1656808336600; Sat, 02 Jul 2022 17:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808336; cv=none; d=google.com; s=arc-20160816; b=wSvZ35G4MphZZxoQqxrFnROJ3Xx8h7cJfEzzS9pAtbzkHKHOFqJlEb1RZGCYSG6Hb3 vIzWreqMaNbHs71Ca3B2l5xGLZisYAA2W2PT6InGshH0cxbBl/MEPhDzfk3vM8VpLTCX oDHY3tDcmnlEmXjt+PxBYDsloKO3UCnUFq/1IE5Suw/uQ4vs0nNAEbufkUPEdJl7KWoD d4HsTTMJroKGJVgYwdtPJ3vS82EOvR7w/83Ztp1UC34lxlpbeht1TFVdTHVzjx2gGbj8 /txw+8rBcwitySMXTH9WpxvUIf19MQUq5PH/k4Df2gfH2bJmg8bl4CLGv99CNJvbXiAt /C8A== 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=Qv/VfIeGOkZCHdobMMQRSaTd2NlDBX1Qsb5kMxKm6nU=; b=gpzeMObW8JRlk8dGV7qCdoCi65h0kwog/KhcPB8SsrAJmDHSEGTSt4lyZXawyWyWWK +1NMWZrqTVzlDC5fgO2VON4WfW1/fHVSGJ2a/xApt2B5KDvR8asI3qNSjLupRzy1+Kdf rR42U923NhXvC8hca2ftQhRxa6v/xxwDDzG4bj68VPWmxhflJfVSzR94zR2BdFj8pfkA SEWxaruOhv2UJ9gAJeZpaon2QKYDzW+R8cuLQ0MUxSzmmohTVwweEzKgVcoXd1VL+n0s qWYjVhFNHg7TgwgPAgSmDnvgFkeZTpzq/a5FGBDMll1wr5vr6zCMhmepduSuEK1piFx8 MJBQ== 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 hu9-20020a170907a08900b007157046560csi7250544ejc.884.2022.07.02.17.32.16; Sat, 02 Jul 2022 17:32:16 -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 19BB868B970; Sun, 3 Jul 2022 03:32:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2103768B91A for ; Sun, 3 Jul 2022 03:31:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o7nWk-001ji2-Ik for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nUxo2thH8s8U7nWkodISH; Sun, 03 Jul 2022 02:31:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 7nWkosU9H8eSW7nWkooHQU; Sun, 03 Jul 2022 02:31:54 +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=62c0e37a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=yDO2GySLOFfm-oxmxNgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:50 +0200 Message-Id: <20220703003152.17850-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01zOePOxyNsldCHtd5uZQG2SYm4X+TRmydGQN+JmGJuuDddtEjWmvPQy1SjRWTAeDlAuj7r9ko 6G0q9qaI17rSbL4nOb9BYEHfmWaV/1baHtgVt/OIq9Qqx44ccw3oql28g8d5K22CbCgxf3awPK+BYQ== Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/qdrw: adjust max colors to array size 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: ZYTVQkIhFQwF Fixes: out of array access Fixes: 48429/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDRAW_fuzzer-4608329791438848 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/qdrw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 849d4a5cad..ff8f97713d 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -368,7 +368,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, bytestream2_skip(&gbc, 18); colors = bytestream2_get_be16(&gbc); - if (colors < 0 || colors > 256) { + if (colors < 0 || colors > 255) { av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); return AVERROR_INVALIDDATA; From patchwork Sun Jul 3 00:31:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36619 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932897pzh; Sat, 2 Jul 2022 17:32:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tBU1DvDdTSn/6q7Q20R5JHaqevjQtQjmRMbyTjO9Tty3ZCcMKWz7DiS+OsAvx4dp8R4oom X-Received: by 2002:a05:6402:3707:b0:437:61f9:57a9 with SMTP id ek7-20020a056402370700b0043761f957a9mr27958878edb.1.1656808345057; Sat, 02 Jul 2022 17:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808345; cv=none; d=google.com; s=arc-20160816; b=RDYbsxt812/eFftoB6sVYQ0/vWA0ONo2HGRo+msu/0Aa0RlvXqB1qx2VonJ7TCGNs+ h6I+DmOwmzE6UiG3LII6EqkYr2KZlNeRlXpW9XY6uarkmS+5tYt2wqLKn91cnoldKdFZ TPayK750tF9vKJ9SOMHc5GqcXNYdwkiz7CPeMRGmG+Xgk2Jp6XgckhBYZSrxsTOqpDYS CMhNpgYtMxOrSsy/jIxbVrhRgGkp9cBum9vWF6VAIFzwhKR84OIvUM4A39NjlxpaUqLC Nq/7M6RZiUxZFUyOKhvUTNBSS3oaYMbMV4A+l79ZJkVJwaQkkOmRg6z7eAhRTgzLmZcj yf8A== 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=5pM4ssLsL8ht4n+eCMyx6ZjPnpG/IpiQt5SAkviLqaA=; b=d91Vi5JdHTS7qajXzBzW49+I4/X506Av3E93EjchW2VDBcJ//grrEEAQ8FZ2fHKaGY PzaRDcUCKHy8sCnkQNrFGFuXcub0jO66WbYWizwy+cklm4DkDCuhLiIttQWNNoIP3xbA ChY3IMNf6oX5LnwjDZDmXw/9ZnnTqpTi43kBTaf7VCTW7nMv/qGPKgtVQcuCpf1FTtJl Z2lqV6aO84r+OUf3disYPClpbPjb+9DMR5ZVTtZ0D0QIZA/O71gG5ExkGh+kbtHfZpMO nFnZWsBxMwUQ/LWQCK9+i3bT39JjzILIdAX0kFuQGvqCcAaui1M9P75TrO4JR7xzJH5F pzZA== 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 q17-20020a056402249100b00439e2ae6f7csi3002036eda.316.2022.07.02.17.32.24; Sat, 02 Jul 2022 17:32:25 -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 1FCC768B984; Sun, 3 Jul 2022 03:32:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F72768B934 for ; Sun, 3 Jul 2022 03:31:55 +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 1o7nWk-007KZe-U9 for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nUxo2thH8s8U7nWkodISJ; Sun, 03 Jul 2022 02:31:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 7nWkosU9V8eSW7nWkooHQV; Sun, 03 Jul 2022 02:31:54 +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=62c0e37a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=XTjV_rmhAchSL7esKQUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:51 +0200 Message-Id: <20220703003152.17850-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01zOePOxyNsldCHtd5uZQG2SYm4X+TRmydGQN+JmGJuuDddtEjWmvPQy1SjRWTAeDlAuj7r9ko 6G0q9qaI17rSbL4nOb9BYEHfmWaV/1baHtgVt/OIq9Qqx44ccw3oql28g8d5K22CbCgxf3awPK+BYQ== Subject: [FFmpeg-devel] [PATCH 5/6] tools/target_dec_fuzzer: Adjust threshold for ylc 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: FGGUucQyfFbI Fixes: timeout Fixes: 48523/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_YLC_fuzzer-5779666425741312 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 8bdecc508b..4dfa6c6ae1 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -281,6 +281,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_WMV3: maxpixels /= 1024; break; case AV_CODEC_ID_WS_VQA: maxpixels /= 16384; break; case AV_CODEC_ID_WMALOSSLESS: maxsamples /= 1024; break; + case AV_CODEC_ID_YLC: maxpixels /= 1024; break; case AV_CODEC_ID_ZEROCODEC: maxpixels /= 128; break; } From patchwork Sun Jul 3 00:31:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36621 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932989pzh; Sat, 2 Jul 2022 17:32:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v5950OcwHzzyi+B8/bUWIzDd8FJU0XApzN7G2vNMepKo2wwLBm4AhsOHdlr8fmXpVOxze4 X-Received: by 2002:a05:6402:d0a:b0:437:66ca:c211 with SMTP id eb10-20020a0564020d0a00b0043766cac211mr29117227edb.29.1656808363260; Sat, 02 Jul 2022 17:32:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808363; cv=none; d=google.com; s=arc-20160816; b=IRFt7hkMcUk4BrBC3mA4SND50xO1CpbELeWFzw4O3kSeAt7aB9ItQhlI42locR6uRv k+XFonuQQ23MKP/33pboLWLTNtaPIwqDHoOvppa5E7xm0pk6vpsInQ4WVt0qp5BwBIaV 6C3uOLAin4yAfaXoeyEBA2uL9CpKGGayPn+QAv+m3NSEs097W5UB0A7jXWO8Y3Mh+8KI dzyMCf2NrpftAWH5YVOhp0AwJbJBO4A0JaebAMWHOTs+XzxhwXcLYWOtZl6ijQEc9DFI H1UTIJzOdD9KYwrw5pXOszMVV0Ljxrq/a7C2y7m9s3Ywl6ZG7JVNHfHnnyObq9mdNm87 LgDw== 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=RBuCKFK5dWqeH9oZloUI4FOU1Wugg9aH3hzu3p3mLqU=; b=vIvPNBMJ7jiRUqRH9u5bvdnTz23AUFTQJ5L3J38lOxtq2XeLbyCCNAXeIL8faussYu W9YekY8fKjP6UZzslG7jhu44r0Qy3hqL7mtIDyrmdDW1ay8kKoNcrrY0BJ40L7sveuzV EDBdDyfQNKoo5cvVx63pCe39P+IoZNClrNrp8c3UUFf/EFj+f1zZ2UXDimkU8x72J1wj tP3PFtltcHaHg+8ODyN1pWGMQEJsDR9tIqxwrX+GBPak0O54jKtYQQ/anZsjdZcloRrU ZSnsGEdpP3vn10cQSU1LIilS6eNZ8Z92PDiqXdfqEKYoz9TgozScxt1PIQqyt011Jm0A maTw== 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 nc3-20020a1709071c0300b00722dbb8f74esi3202983ejc.960.2022.07.02.17.32.42; Sat, 02 Jul 2022 17:32: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 2AE0568B991; Sun, 3 Jul 2022 03:32:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF9C868B91A for ; Sun, 3 Jul 2022 03:31:55 +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 1o7nWl-007Kcf-B5 for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:55 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nUxo2thH8s8U7nWlodISO; Sun, 03 Jul 2022 02:31:55 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 7nWlosU9k8eSW7nWlooHQX; Sun, 03 Jul 2022 02:31:55 +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=62c0e37b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=XaNVvuSEPGLJp05tYRQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:52 +0200 Message-Id: <20220703003152.17850-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCQEsZ5a8VtQvwapmw5JJ4Ag86FatiBz9LnegRqelJ7ux92YcBN1Df2AnkjdlhOegm6PXMkhXhYegVniNI2iEXNY5amHzRN3K3F1p7DdDG3TaV/dDfvo r3vw1rgcJNsTLqiBfwfgyqkSg1pjsnFRf1g2P8CkyxINUA1KWbpC3cEVo0AV89dCT1fbul6coppV5A== Subject: [FFmpeg-devel] [PATCH 6/6] tools/target_dec_fuzzer: Adjust threshold for LOCO 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: l3GNs8g6BEf3 Fixes: Timeout Fixes: 48584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5741269015461888 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 4dfa6c6ae1..b480f59808 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -237,6 +237,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_INTERPLAY_ACM: maxsamples /= 16384; break; case AV_CODEC_ID_JPEG2000: maxpixels /= 16; break; case AV_CODEC_ID_LAGARITH: maxpixels /= 1024; break; + case AV_CODEC_ID_LOCO: maxpixels /= 1024; break; case AV_CODEC_ID_VORBIS: maxsamples /= 1024; break; case AV_CODEC_ID_LSCR: maxpixels /= 16; break; case AV_CODEC_ID_MOTIONPIXELS:maxpixels /= 256; break;