From patchwork Tue Jul 19 11:34: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: 36830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686633pzb; Tue, 19 Jul 2022 04:35:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ttIQx7QMbzhQk8nZDpvP9qQuS72SeAbuexECg/jiFP+SreC9Vd/TaLxAM4ujVU7oQTreMG X-Received: by 2002:a17:907:e91:b0:72f:d76:b22c with SMTP id ho17-20020a1709070e9100b0072f0d76b22cmr15208731ejc.364.1658230523467; Tue, 19 Jul 2022 04:35:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230523; cv=none; d=google.com; s=arc-20160816; b=lGHB6R2y8lMjMc93iEcEWgrIwjvvdpRdN5sgS26896WhJIymstOBJV6KjQSLcZSzUU iemT5DEz0m/2p6WLb3W+78KmpUZMqDSy+CQ8klkarLZQK5LblLxdDfZEa8mlgKCGn4fk FRT7PKpKNyUm3dw1+mbkbuPDbGgumNUrT33EFMkax1Quqj3iqEMztdpwkQalZwQV6d0Z R7P38ciKCDZzmoTtFeusZQIu66PmOXZfrxtMPjEEi5RvH1Q0wE6LHLEb33dqDrVsvmOt bQKGD9T3fllONsY2NI4lyimbA3C5mAXfe+1iFh0FAHlkQKW63ZfaYpjnyDpSp1LwIf96 6CfA== 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=i1JIHp6mMVQcZEJtug9gWEKwrBe6xQ8nvQ2G9Y874YE=; b=jvPS5mKlHp8eMUI/bJb8kNthr2ybEiAfknKundqeLxFpx2zVetb14EBGLF+E0Gl50T GH2F9YnNuKGJKVPHNLPk4MyTsMGc9SL05De5QjwPOSRRIgvMB94naV94V/KepKC9L77y u3h1gwuzT6LGUPFYBy0TvOgFDsbZhafU7Jd9XZMJsfRs51vbENb4bFulpYjEWAOhm+6u kcbLuYEl6FdJNNWHK9W6Y58Yo4xI/UiHeHikLkB/mM/ajNziXb2BG2UlY2VuxtMnGYFE IaRmnV37vQoGsH6dIlxpsa1kDvAVzGGOy5dn8lC1TUMemtVf9eXqmt57W/mOzEmFyTuN TPaA== 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 bo25-20020a0564020b3900b0043abe7a7390si16914013edb.332.2022.07.19.04.35.22; Tue, 19 Jul 2022 04:35:23 -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 63A2F68B1AE; Tue, 19 Jul 2022 14:35:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A70A168B576 for ; Tue, 19 Jul 2022 14:34: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 1oDlV8-00FNzW-MH for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:34:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlV8op7If8s8UDlV8oTohc; Tue, 19 Jul 2022 13:34:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DlV7oZiynOPqFDlV7odV2I; Tue, 19 Jul 2022 13:34: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=62d696de a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=JHLi62Ja86Xoe6BAQFMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:48 +0200 Message-Id: <20220719113453.23169-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLkvILqmjvZndDk3MCFVSdyz/mi5tRPCJiDKNKVIUYpWXb9KtIQKg9bXmfCN/l0j+AdOuNNV3X3l8PebSCTWMML25Dz0IC+5FhV5Ze/24lIH3vInfkPn gvz9Lb1PY4xZ/8Gaptfz+D6B0yILKOND6VDCISsxwl/8DzEd2zx+NAIFKWJ+9o1lkWNRE6QuvgqrsQ== Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/mpeg4videoenc: fix encoding long frames 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: wA6reerO+TfH Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videoenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 8f0452de3a..5f83a9dff1 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1081,8 +1081,8 @@ int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) time_mod = FFUMOD(s->time, s->avctx->time_base.den); time_incr = time_div - s->last_time_base; - // This limits the frame duration to max 1 hour - if (time_incr > 3600) { + // This limits the frame duration to max 1 day + if (time_incr > 3600*24) { av_log(s->avctx, AV_LOG_ERROR, "time_incr %"PRIu64" too large\n", time_incr); return AVERROR(EINVAL); } From patchwork Tue Jul 19 11:34: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: 36827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1687483pzb; Tue, 19 Jul 2022 04:37:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1skuKTSAK4D7mzrO5zGXSsHPYowp7juq2PLpU4HZtGseLpgtf8f4eJ1z3qb8jnAG8SBGFHX X-Received: by 2002:a17:907:7e87:b0:72b:4af3:bf57 with SMTP id qb7-20020a1709077e8700b0072b4af3bf57mr30498725ejc.9.1658230623738; Tue, 19 Jul 2022 04:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230623; cv=none; d=google.com; s=arc-20160816; b=ikBB2wCMaUEpfv0sUtkQKeV9teW+rmTB6Hdob66ugLtfWrG4eKNgDMjckp3qTGc8Qw Snh7T7L+8TFRxCtvnARSRSGCByMh++XOgo0IaR2iJFqzVquBxTeaWRzCQT6FgvtvT0j/ P/89bpVJrgVSo/docIhUotzwrcsiv8AKj6eugQmo0dE3uEy5SubxL+JkaUiiRUz+k01/ GUqTuKVZ94x/yVVLVN74vvS7qDku/PL5hGNt7RO/LXzg4OOAsuTqB9QwOFqUJHUPmyg1 xfm1v9AyJ6B/ciayytX8eYN4oK/pwI6tfLMVeMllnwO6v5cfUNDwe1SlRMfSJnwc85A3 VMUg== 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=xLvBXMmL1Iz+gxoD+K1rE72FFjPJ57aLfbSAYVp9T3k=; b=UluiPv01VR9DgEls1nDDeM2/kOvzXM3AoOR44g8XhY+M3dzCQO7R1HJ68tIuTeqzVB H0l1fIYjdP0H5iNmzE6wSZmwMO9MJLBJ0UgEJFynRVTpglFlOYkDz85hIX8ETFev1z9W Upy276XO9J9hjxj9MgM0iQXlMoTWyD1h0RFzVALRffhX9pSbXth82QKKNYGoK3OjKH1v wGm4PTAEhUSNBQkOY3mLYoss12hmk1Y2NrxXTMNcagUFWijaziJYJyNZMqJ+Vt4lXUwc phyIKiOH8Geth7YcNHlfjuMkZb3SZrEgmnQ0WwSZRkLibt+vkbq/X1M//HifsxK+vcc7 RGVQ== 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 k6-20020a508ac6000000b0043a83490a4asi18092300edk.498.2022.07.19.04.37.03; Tue, 19 Jul 2022 04:37:03 -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 9138A68B641; Tue, 19 Jul 2022 14:37:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADDE268B61D for ; Tue, 19 Jul 2022 14:36:54 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDlX4-007H5N-AD for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:36:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlX4op9rz8s8UDlX4oTpdn; Tue, 19 Jul 2022 13:36:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DlV8oZiz1OPqFDlV8odV2L; Tue, 19 Jul 2022 13:34: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=62d696de a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=GeJhdV6fVz8uRQgnty8A:9 a=0rU6oQn3ptO-wBQ8u6O6:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:49 +0200 Message-Id: <20220719113453.23169-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNjgmC1e4BE0tX/TNCtVeeEKpoWg3k23kFselcpXWHo+dwpmE6iHlFmbMgfvTuc+GmYre9YBlj13AapCZXCGOJRS7YQeJ24JHkPaYgJGnwCetQxtRfDC is2xQZrkHH6QPRflkMOeuPKO/qhI5N1dVMqnfZEnrYwU0b5Jvr/C8vtIbg5CYDR7KLhD8iqY1+7ivw== Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/exr: Check x/ysize 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: K4ggM6aB9XUU Fixes: OOM Fixes: 48911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6352002510094336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 8cd867a32f..c25bae8cd4 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1241,7 +1241,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tile_y * s->tile_attr.ySize); td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tile_x * s->tile_attr.xSize); - if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX) + if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX || + av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */ @@ -1265,7 +1266,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, td->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1); /* s->ydelta - line ?? */ td->xsize = s->xdelta; - if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX) + if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX || + av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */ From patchwork Tue Jul 19 11:34: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: 36832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686971pzb; Tue, 19 Jul 2022 04:36:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vOjCHEGydk6PKH5ib/AidnUuwHurmflcfEoghrqQ6bl2pi6+Dp67jBB1Vv8sysnCltF0mX X-Received: by 2002:a17:907:160f:b0:72f:1442:ed54 with SMTP id hb15-20020a170907160f00b0072f1442ed54mr14906598ejc.339.1658230560507; Tue, 19 Jul 2022 04:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230560; cv=none; d=google.com; s=arc-20160816; b=dIX/TViwNwVQyBnYlDfAWcLh94lkAaJ8hUZ4dIrnswcjAC3Tp0z9zPA2Rvn0zUXqVp JlKvglClUlJdlfcUS6Pc9iMPcJV/62CQ8JGB1s/FUSAOs4q4YV1YcoMQdj0LUGLW5X6H PBWSsNPaMTfpOny/LRfajk7eCp8wCKZg8y4TarTZQqLBmDWcbn46+miSe0PGeaCGVNsn eoRVt72LQ18qwCWb+J8ZsWT3KJ8MuKSWA4jD8fizWVwVnImbyw4I9x1W+YDzckGEnBuF zWdrWFKVj1UDz583BcLN+vzFvXz+JBziqDhcudbu0nq0GiUh0W2k1dPx3j1ueXFqfEba q81Q== 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=PJU/nVugprwTHEJlL/MI2GbNOosle1uNQJhCDLaonmo=; b=wm9vBF05sCakgkkpBndFtsmLgJYaa2z0CT2jSB/IV05f4UjHrUrXQiWvUVOqartn1h twreqs4GXQDw5cCUcSdz/mx+eeb7AEqGeRACQZlc2ro+I/7F2xN9F2AhZVe0523A7fhG ZIK1j4prBcnx2M+9xju1MOp7OHctnH+LAGZsK2YB8W6yuz0Kl+JZe2ZxNx23WgOCI5rr x7cpdSSnp/I5PdhN/SVjxT7FnIazsaPdP2XTQ7EjRaUpn+h5PTvIeh+//SKK7Jw933Bs TKNwPRwdeNZ31++cjWVhrfl2MMq9lD8VHE0EmmSHvmfXGYPyfqS1lSOIcTdldCUN16AP tnSg== 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 cr20-20020a170906d55400b006fea113fc9fsi4630832ejc.762.2022.07.19.04.35.59; Tue, 19 Jul 2022 04:36:00 -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 5B8E268B61E; Tue, 19 Jul 2022 14:35:57 +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 24F2568B5A5 for ; Tue, 19 Jul 2022 14:35:54 +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 1oDlW6-009qVE-2Z for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:35:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlW1op8ZS8s8UDlW6oTpEH; Tue, 19 Jul 2022 13:35:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DlV8oZiz8OPqFDlV8odV2M; Tue, 19 Jul 2022 13:34: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=62d696de a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=JXhyvhNG8ALYn-iyFmgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:50 +0200 Message-Id: <20220719113453.23169-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfE73MECyFFVLJkcphrhK0MMEf15HSijYBahY0qLXGH2VlymkngYlk6gB1xBlDKlgmN0GSJNZALScrN4T97A3/IhleGNQRd62L+2yNIOPavNpY5CS2qNy d8sp7eLfHVsBbPVtNmcKxQVe8G9IkV2yfyj+22kbr5g4oKyRU7GncL2DVy1t9nnlxnTlOmRv5kjnsA== Subject: [FFmpeg-devel] [PATCH 3/6] tools/target_dec_fuzzer: Adjust threshold for MMVIDEO 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: TZtArleaNCjU Fixes: Timeout Fixes: 49003/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MMVIDEO_fuzzer-5550368423018496 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 1587045e02..017c5cf024 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -246,6 +246,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 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_MMVIDEO: maxpixels /= 256; break; case AV_CODEC_ID_MOTIONPIXELS:maxpixels /= 256; break; case AV_CODEC_ID_MP4ALS: maxsamples /= 65536; break; case AV_CODEC_ID_MSA1: maxpixels /= 16384; break; From patchwork Tue Jul 19 11:34: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: 36828 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686478pzb; Tue, 19 Jul 2022 04:35:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u8Lqc0DuAheRVNxXNhRaE45g19BJmwlc3YI8WPGCoFk6fGiaKU8VuVfPf8x2FlzqpBf59J X-Received: by 2002:a17:907:7349:b0:72b:4d9f:1418 with SMTP id dq9-20020a170907734900b0072b4d9f1418mr29961757ejc.304.1658230504459; Tue, 19 Jul 2022 04:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230504; cv=none; d=google.com; s=arc-20160816; b=eeN2nu7nE+9Qva7sm06po8VUR1jLjVjBje9rXnipcHuYKHGu0G9d2g5tGScgncJDkJ EmSZjhsjP8oiDpC3rKBLRwXoc1jlBd48A+Bbnr5qlNbG504ISe+KMWD/eS+rPW2zt3uW EjhcROp9RftvRfZ7oF73VtNpmK70vaENr6vE4+y/LBjfS/oupXaaG6dkBTb34HvWmWjE LTsMDVAqyANfcJOMxQZY06XDIHN4FObGOZnbUJRbjpO218dO3arVZxJjvppQjq2Fw6Zg kEm/KkDLby1oo9W+Z7jqQEeMNh5HiSK/LypYnwt2yxxPFUgbU2uyPgnmcKmvfsRevx+V WJdA== 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=6a+zUSCg9FDygN8/BUwp85irbhGSf968/rTH95nMd5I=; b=Rt7WX5McQK+1t/0mBY5zObQmbVcBjc50SfPCwnBYcZQltY0CT2EultdqHMAB3h+MYA GffIhACVMNBVJRq3DjpE2g2PK/8LU7yVpMnklX9cj8+L+CCV2juGrjxdqS+TR/LG+uWj 4tUYT/dMq22fXPPNiM6BbI7jj7qBdaVMtqJo7JE/tw4RB09c0QYJTRnRjc78pSsnzcBJ hbE7F8vAdKV30DjbsVcayuGE6xs5CBZNgSrI7821iznl+wC7Bei9fBo2Ifu36J5LUFJk PezY/JV/9z3kiEoTD2FubX0NTuWgRiLYXAWvbCQ6WJShXEzzo+F+M9YDPPAA7Uou0bod NvWw== 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 hp23-20020a1709073e1700b0072641de78b8si19820881ejc.483.2022.07.19.04.35.03; Tue, 19 Jul 2022 04:35:04 -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 67DB568B607; Tue, 19 Jul 2022 14:35:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C17C68B1AE for ; Tue, 19 Jul 2022 14:34:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDlV8-007GrM-Nj for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:34:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlV8op7Ii8s8UDlV8oTohy; Tue, 19 Jul 2022 13:34:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DlV8oZizAOPqFDlV8odV2N; Tue, 19 Jul 2022 13:34: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=62d696de a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=WOSIoMAa5UO-LXKbiF4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:51 +0200 Message-Id: <20220719113453.23169-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLkvILqmjvZndDk3MCFVSdyz/mi5tRPCJiDKNKVIUYpWXb9KtIQKg9bXmfCN/l0j+AdOuNNV3X3l8PebSCTWMML25Dz0IC+5FhV5Ze/24lIH3vInfkPn gvz9Lb1PY4xZ/8Gaptfz+D6B0yILKOND6VDCISsxwl/8DzEd2zx+NAIFKWJ+9o1lkWNRE6QuvgqrsQ== Subject: [FFmpeg-devel] [PATCH 4/6] avformat/asfdec_f: Use 64bit for packet start time 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: cVz/Dfa/dvI1 Fixes: signed integer overflow: 2147483647 + 32 cannot be represented in type 'int' Fixes: 49014/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_fuzzer-6314973315334144 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 7fc174635b..bdbd4271c8 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -104,7 +104,7 @@ typedef struct ASFContext { int ts_is_pts; int packet_multi_size; int packet_time_delta; - int packet_time_start; + int64_t packet_time_start; int64_t packet_pos; int stream_index; From patchwork Tue Jul 19 11:34: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: 36829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686562pzb; Tue, 19 Jul 2022 04:35:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vHbC0VvG+tliiQalZhTH4s5VCa6+O+0gZ4I5oS8zxASc+hKmqa8oOj8lJKknL7eHI+NEP2 X-Received: by 2002:a05:6402:48c:b0:43a:8bc7:f440 with SMTP id k12-20020a056402048c00b0043a8bc7f440mr43147576edv.8.1658230513316; Tue, 19 Jul 2022 04:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230513; cv=none; d=google.com; s=arc-20160816; b=XE6jqo+qJqrOnv54PT6DXeXqpAnJbS4WSc0tIqGjfM4Xi7FYbaDXuZ10xsyo4fnZd7 DPzPpi1lmITL2hUnjlG4WDAS9bheoSur28mMVA3udgJycuBQ7JvNdX/GGoBMjHrSe51F mxNNVK/8Hgc+hhZoLAOwWwJ5rmcRxeCYbLGWCYqdhs5fmQiKNm4Z3E7I8oXqSErqOAep f/M54ix50Kz4j9zVefG+DSt8o1dzii2kBqv0u4BfhNJ+bUJvwsNH5Xtf3BWWgC6Do6pt 4gCYuo6yEmjh7cG0H6tJ6L2U6qjZs96wwCe6wdKHYf5YNHdzEPQFHOuntdksLNoUAAlq DQgw== 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=6jtZ6cTSYs1u62f0jDujOiyEZApPa70mjvB/GzFS4zg=; b=lGEjpLuTlmfwbviU2FT7W1QYxctGKI4s1Aaiz4rFvNpelxi0H+gy3Hqjy4xjjL3/lL VGpUosXZfF5Uj7aq+CZtNaQopXvtvhhFasK6qkdOYgo7T5O0EmjAi5yA1HcC6oZlI0SP CABnr2x1cK08ImRTxnk6Wb17Qt7yGMSlKJ0EVLyRiJZam9oZ9VAzpw63pr/UkBpvuwqz Klsk8ESUPNjw8yC5C9IIYAEr3T+J4Q7E8KQT3qfw+yv3amGOqF7YsU16KcVEfEsN6CZf oDpIxR9Ch7AInL5SHpxXRuO65wvyI9l6d00xaOXio5xjoyNJvQAf2E4hg1KUNM645s6W Ir4A== 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 dr11-20020a170907720b00b0072f3a7e584fsi7196957ejc.958.2022.07.19.04.35.12; Tue, 19 Jul 2022 04:35:13 -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 7028268B440; Tue, 19 Jul 2022 14:35:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5DC468B1AE for ; Tue, 19 Jul 2022 14:34: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 1oDlV9-00FNxL-3o for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:34:55 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlUVop6Na8s8UDlV9oToiK; Tue, 19 Jul 2022 13:34:55 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id DlV8ova8q8eSWDlV9oAvdL; Tue, 19 Jul 2022 13:34: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=62d696df a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=CVMNtwDyNrjo306PlQwA:9 a=pZYCB35So1-LydZ1GzXs:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:52 +0200 Message-Id: <20220719113453.23169-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGJ6I8lmd8m9TkPJARBPvLV/zCuJXg5i9n0rP/7XGSgL63bkCatFDnfIooyt9q4C3lc19MEBrMPWQw1rkHF+HfU/VvqhtKh+78TvYNaLc71oDO2etgg4 fkW9w0bNT6oHu1bRNVEzefjixE5eQ35dWcYHui0ypW2UolfwGp9x1f+JoP17qVfvteTqXB78cw/tQQ== Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/ffv1dec: consider run increase in minimal golomb frame 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: CsQKln+o2n1b Fixes: Timeout Fixes: 49160/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5672826144686080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 01ddcaa512..9bdac0be4e 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -883,7 +883,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (buf_size < avctx->width * avctx->height / (128*8)) return AVERROR_INVALIDDATA; } else { - if (buf_size < avctx->height / 8) + int i; + int w = avctx->width; + for (i = 0; w > (1<height + i + 6)/ 8) return AVERROR_INVALIDDATA; } From patchwork Tue Jul 19 11:34:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686703pzb; Tue, 19 Jul 2022 04:35:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t6bZ3zY8qv3vvUZpQTQ0IM/DvkfJ96sgNmBZmrsquhm5sDFoCH+3IRIFfUEYNzIBnvtAqY X-Received: by 2002:a17:907:3d90:b0:72f:2994:74a1 with SMTP id he16-20020a1709073d9000b0072f299474a1mr10324998ejc.261.1658230532116; Tue, 19 Jul 2022 04:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230532; cv=none; d=google.com; s=arc-20160816; b=diCLh+XHmapeHleQ+3Ku4gCw6rEOFjRxBAz4+vK4EYXUt8QeIzjwWxmy20xVGVRHoL R1X9g5NOMQShHcpqaW3HaYdFAeQeZjdDRnESbsDco3BNk/VJrUFiUEyadhuTCTgvM5jI CVwae12ng2lyDairf0cQbD+JYj8XiSZRevr9oVOle21kuOYPY8VT0H+/MCcWIsAzKtB9 pzHXsZGCBlcJkHd2lcu7Ckllv72hKHcVct2NYoxEtxKzDTUy7tSx3qr6oc7exQeWI9nq GbTRRjy0Cr11lB2EUL3MBEuuFonJC//1j1e+iPuJTdXj9cOzTqrg9B0LJvnbQ0YvkPfk KrGA== 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=H85IVY/sX461XVYhsdh9ztMilkB+eu9mFh7jjSq4WA8=; b=AqXh6IJOT4nIBBMJqZh8NWzTTxeFLRl+mGdbOyKP4//21DCDna8Uhw7m3kDPTC7ZOn ja/w/oCN/eD9iqca/Ps57SiCiD6OQKW0A9DCNcw+MeN/ARya2PD0hwW+C9213dCEbuCE fVplRFWEYgmUX9+YPwzfcYnkfQGM4nVVZBsaH8TADclotX22mv+duJoeSGuz46mTPYAm wPI1+lsGgFSLssCwB31CqvkZNa3aTHmdnXskUlMERTpW27xeTR4J3SssWjewlucVs4jL /hW5Focovapy1LFCnrRUm90aBNQYYfz2eDmjvX4KkRdgCAwmQhgZoDCZmeeWplmr4u5s jb9Q== 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 k11-20020a17090646cb00b0072b4a71ec5fsi16652385ejs.882.2022.07.19.04.35.31; Tue, 19 Jul 2022 04:35:32 -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 3FFF568B576; Tue, 19 Jul 2022 14:35:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D626168B576 for ; Tue, 19 Jul 2022 14:34: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 1oDlV9-00FNzW-Ff for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:34:55 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlUVop6NZ8s8UDlV9oToiU; Tue, 19 Jul 2022 13:34:55 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id DlV9ova8y8eSWDlV9oAvdM; Tue, 19 Jul 2022 13:34: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=62d696df a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=_x0bn848rAptHbq-LA0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:53 +0200 Message-Id: <20220719113453.23169-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGJ6I8lmd8m9TkPJARBPvLV/zCuJXg5i9n0rP/7XGSgL63bkCatFDnfIooyt9q4C3lc19MEBrMPWQw1rkHF+HfU/VvqhtKh+78TvYNaLc71oDO2etgg4 fkW9w0bNT6oHu1bRNVEzefjixE5eQ35dWcYHui0ypW2UolfwGp9x1f+JoP17qVfvteTqXB78cw/tQQ== Subject: [FFmpeg-devel] [PATCH 6/6] tools/target_dec_fuzzer: Adjust threshold for MWSC 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: +eYNoZDQgx9t Fixes: Timeout Fixes: 49172/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MWSC_fuzzer-5213749102903296 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 017c5cf024..49baa2da6c 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -254,6 +254,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 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_MWSC: maxpixels /= 256; 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;