From patchwork Sun Jul 3 14:18:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2247199pzh; Sun, 3 Jul 2022 07:18:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucPpWKNbgYs1PWIT+fx2N39xHQObZDkdJhKQUycoOF4RRhoJ6wVxAbmAOHsUrzaCE2iQFy X-Received: by 2002:aa7:c2cf:0:b0:435:6576:b7c0 with SMTP id m15-20020aa7c2cf000000b004356576b7c0mr32889982edp.18.1656857914770; Sun, 03 Jul 2022 07:18:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656857914; cv=none; d=google.com; s=arc-20160816; b=cA0voOZM5KDWGop8BPKUkh5IOTpf5bFe1a1fgQnV9J0dVBwO1MbwwvHqutK6tUspmz a1ixJ+2Xh9MP2/jzXWAQO4H1srp8fL3JBkfYbdBF0cC2UKU3//8aodsQRQv4AsB1P7Sn QTVQgcQrsoVysRGl5vPNhW+3rXur6a8m4l9YReiAeoG6iXubn0fD+C8ek+fozhvJO8Cb 5T+FCaMNh77PO8MfNdIg2Xg8anbKCFzEgvRXubAAJg8TT+QJCKHXMXCVK+cMFuHGOFwJ Xan5eGoYWfDkbOGCfghxzt6IUi2hTydVJJjWa0RRyDwsdYo3+osf6SPzkKnxM2dU95S/ DVCQ== 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=miVl3RJr/hOgFtjq5hBUOPJMOhCXLJZRLASIth+acT0=; b=vosqhoxFzIdUVsYGSWGnjKkgCTWk4gf7H4wpRik11IsyC3r8vDSSXXawdjJYLHBwd0 GkGRJ8iEKOSYaaVhFK6oFMkBbpBjfy7SAry/UY4kCzQDpQ5NNqDCI6PFSNbQeQ8Il279 uOLtlNRcs2bIkp/7Xzh0CG0TEndu/v7aQhsBZk4uMmuvhKSj94H+WLc+DgyWB7ogaVMA vIcfZsC6s9US3FdEMEsOVye24WbNxE3R5D4wE5ZqAdfmS+GRgzzu8cPAQzpgbCGW7u9m 8tSmtWyPmMFh/mRFR/XEr6VCA1w63xytlqCWz4r9NDZC6AZxo8lDOKgxyVH6xbRt48G1 A2PA== 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 t30-20020a056402241e00b00439f19908c4si4749469eda.533.2022.07.03.07.18.34; Sun, 03 Jul 2022 07:18:34 -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 0BBB768B9F1; Sun, 3 Jul 2022 17:18:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 386FC68B956 for ; Sun, 3 Jul 2022 17:18:14 +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 1o80QO-0087kJ-LW for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 16:18:12 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80QEoJS3B8s8U80QOog5Rp; Sun, 03 Jul 2022 16:18:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 80QNoxH2b8eSW80QNop1Ej; Sun, 03 Jul 2022 16:18:12 +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=62c1a524 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=CE-9r25-RQUIDO4D6lwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 16:18:08 +0200 Message-Id: <20220703141811.29914-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfPiXcHc3h+Btn1JIJmTkcuo/ieBiKzXOUffw14VcPtT67/KAvYvnIcOXx0byoYswkJy/XiHgIGPVIn0uLl5CrrrXh78k8eGtC3SpbPgtL6LNOSi35LSO lFyJPVkii9Tg/IpGYPIymsVKgyzRA97W5QT4l4joT6pEWhwF+Lva/dWKSw1VylujSHqnTDXH/qHPUg== Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/ffv1dec_template: Fix indention 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: hgv3XV5PJtpg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec_template.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index 0b1d176ba1..9b1d65e825 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -93,11 +93,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w, run_count--; } } else { - while (run_count > 1 && w-x > 1) { - sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x); - x++; - run_count--; - } + while (run_count > 1 && w-x > 1) { + sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x); + x++; + run_count--; + } } run_count--; if (run_count < 0) { From patchwork Sun Jul 3 14:18:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36636 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2247492pzh; Sun, 3 Jul 2022 07:19:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t+ecrB3scZtrBKS7ErzX3mcw3fPww6zFnLdHMo93tFlZTbE4FgtiEPJcYZRyKPvE1x2EIP X-Received: by 2002:a17:907:7781:b0:6fe:4398:47b3 with SMTP id ky1-20020a170907778100b006fe439847b3mr24154525ejc.513.1656857957305; Sun, 03 Jul 2022 07:19:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656857957; cv=none; d=google.com; s=arc-20160816; b=kIIFdUMvxbewlkjSzYZMYcySmYxA/m/1Y7VEh2LIjJZYqHQTD9GdXKjcXbqApzbXHk H372eMdNeisicTn+FodhPTw5A0VabU0oISi9DLdHijkcPj8HceN9gUHLdZT/+35/lB4Y hpIJ4xkcF1AEryQUFj8lpFblIUdjaHyxRD8vGeHW7gRc9tbeYDO5GQ5S078K4QpnL3LU L+PFjEtRNPD+jongEHIPPNcPA6+z1mE7qbdNKrmLoNeqzaQSSrmuDONKYuqEBh7VuyOn XyGZrJOqdL/hTRXK9vGa0XyXPhAtEQXFyG9ELY7MoLX2Rw0ZtBr2HFbceDQgSfsPGfvN mHEg== 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=0JqYnG5/9aVc9vEQN51LZirEMV4VD5b3+7aoPo4EYDY=; b=FAadtxb8uRstW8IvqPIJ3iTqAbkhdo5h6z2x4Ouh81dZu/HqkPoujF8WXdgo1+N2sI 9oHIgzLyk57iaCAMvgL5j1x87py94XMs/qlZ4pzecyWppNcgoha8lA7TR9DquwdveG0C wt+TELnLMm0Y5SCNHI1Nk9nHlqg2IDj8FzFAyWJq+5rdQhrUul7As2A6p34burQHT8hv MHlHr0OHIJP3S21KQUmp6ngxXjUy2DXeR49M5spJ6MSjDLT/nvY4A2ILf8ttIW/zaX56 99jsVohCE92gXAM1pUX/qooyaNBdn41DwiYxm4wvhAWj87KxddksIgnnxUk2RreNQ6DG njCg== 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 o23-20020a170906775700b007084cb35e5esi1118600ejn.442.2022.07.03.07.19.17; Sun, 03 Jul 2022 07:19:17 -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 1A1D168BA04; Sun, 3 Jul 2022 17:19:15 +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 12D6268B9E3 for ; Sun, 3 Jul 2022 17:19:12 +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 1o80RM-0008Nx-1V for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 16:19:12 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80QmoJShY8s8U80RMog5eF; Sun, 03 Jul 2022 16:19:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 80QOou6WgOPqF80QOoCsMi; Sun, 03 Jul 2022 16:18:12 +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=62c1a524 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=1Psjy5D6vV93uVQwh8cA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 16:18:09 +0200 Message-Id: <20220703141811.29914-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703141811.29914-1-michael@niedermayer.cc> References: <20220703141811.29914-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBIxgh0/Nl3inO7yro+ppqwGR2lbLQPdH7jbdoTbhAUjz+fnpXuzE08tYZfz0xiJvpOve35G1S5eg6UmgAJ2ESaFPv3gQpYkfs8ERIdnkHChuf/8vGk0 afXw4FR873rpbBZPugE0L/ivKf7HG4TY00wpC3lCYenjAAd0VykTHM2b4aKe5bpwBdPsOs0DL2KXrg== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/ffv1dec: Limit golomb rice coded slices to width 8M 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: zFMRynuSNuaV This limit is possibly not reachable due to other restrictions on buffers but the decoder run table is too small beyond this, so explicitly check for it. Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 365f8b77a7..7731c15c87 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -187,6 +187,9 @@ static int decode_slice_header(const FFV1Context *f, FFV1Context *fs) || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height) return -1; + if (fs->ac == AC_GOLOMB_RICE && fs->slice_width >= (1<<23)) + return AVERROR_INVALIDDATA; + for (i = 0; i < f->plane_count; i++) { PlaneContext * const p = &fs->plane[i]; int idx = get_symbol(c, state, 0); From patchwork Sun Jul 3 14:18:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2247143pzh; Sun, 3 Jul 2022 07:18:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tqLX1jIYBgALmJXqkMwXzK01MQ2s9so3xxyMly4URekkTupb7Vh+lRVdmyr/+f1ezmtl9+ X-Received: by 2002:a17:907:6d05:b0:726:a670:253 with SMTP id sa5-20020a1709076d0500b00726a6700253mr24865092ejc.23.1656857905556; Sun, 03 Jul 2022 07:18:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656857905; cv=none; d=google.com; s=arc-20160816; b=v7JBdfT3+pXaIh76P58EBNksuVb2fLGQ7eGqTff6uKTszN/ArlKj02la133+Rnr15o KAPL4Shz+ROIK+zcDj1OMjoyB3XcfN1n8SrFONm9IGlsa4rtT41MJYyb1P93t58k/7UQ nbq4gr0YxZNCGQSe1tyAJ5hfIEPUuxBFxOQVtQL6v7kOcK5Rsdejv4Ob8N6a9XoYiuyb KOP3Gz5OdAnrZ4nLrorOROotxWA9y068Bol5iY/YiELmDAmn6OH0iZN1wbLFHv5Gw0Dz FQEXWVs/Xx3YFbXTPvmNxlaGJ9q+YTWUY+Go818VTAchR0zji8a7DzYoJXGdCw/jSPT0 VCMw== 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=KfGM76WdG388ZBCn8+4Rs3Ndn4YxjPNHSu3iJ+AU2JY=; b=ojCA6uKicygRKrbneDrxcHzg7XL4xBkrb7LBZGaSzWGbKx2ts6JSMfsEcJMl7ittDi H9CErqdHMA4wCbEaQa1g8p9ZNJ/hGds++TQ9j3CPywB35K/jM25EQfgI33jMVbVrEoKl CFCsLodNGioAwPAQfVPpoJL4kcfHruEyLQ5pDe+MT9EXcA9w3jr/kBQKigz2E1tWb4LE LD/y4tDlIKIYU8Yx3DsldGxtOazBQy1/b9esmZSQSi03ePRd6S6dxLTbarvdmGPe+oAw 17HTClaKO/Bz7LFq+34I6U02mvc2DO6TFz9KrD+wjVChhx7yrFURwI9c2AD2ComcDZWQ FxjQ== 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 gn42-20020a1709070d2a00b00726c8adb7efsi18016580ejc.224.2022.07.03.07.18.24; Sun, 03 Jul 2022 07:18: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 E3AF268B9C2; Sun, 3 Jul 2022 17:18:20 +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 AB5AF68B956 for ; Sun, 3 Jul 2022 17:18:13 +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 1o80QO-002V7O-Os for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 16:18:12 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80Q4oJRpV8s8U80QOog5Rt; Sun, 03 Jul 2022 16:18:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 80QOou6WjOPqF80QOoCsMj; Sun, 03 Jul 2022 16:18:12 +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=62c1a524 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=f9BGP-vK52ONevJoSPEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 16:18:10 +0200 Message-Id: <20220703141811.29914-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703141811.29914-1-michael@niedermayer.cc> References: <20220703141811.29914-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPiXcHc3h+Btn1JIJmTkcuo/ieBiKzXOUffw14VcPtT6F6hQCGgAGtoYrWa+7gomAvwJ4tdHsoMbE9vf+Tv5OB6x2B+T4SIoVJTMidpLCsFE80S/SNAm z/QZpOyGqP7kPmm/tPZC6/9Bp5RTMVAtDj5YzGr6NM9zdxMdPUbsoQclXapJ7OExXLnU4gu7rZz87w== Subject: [FFmpeg-devel] [PATCH 3/4] avformat/avienc: Check video dimensions 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: LzzPIs6jlfuc Signed-off-by: Michael Niedermayer --- libavformat/avienc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 2264241d57..14115b3e2b 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -426,6 +426,10 @@ static int avi_write_header(AVFormatContext *s) avio_wl32(pb, -1); /* quality */ avio_wl32(pb, au_ssize); /* sample size */ avio_wl32(pb, 0); + if (par->width > 65535 || par->height > 65535) { + av_log(s, AV_LOG_ERROR, "%dx%d dimensions are too big\n", par->width, par->height); + return AVERROR(EINVAL); + } avio_wl16(pb, par->width); avio_wl16(pb, par->height); ff_end_tag(pb, strh); From patchwork Sun Jul 3 14:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2247260pzh; Sun, 3 Jul 2022 07:18:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u83y13+cbF5LqzK4KMhOfFJ7I7tYzvU9WhOvSDsejYZdQznJKQxnPjeWVnMZzetrUFmNj0 X-Received: by 2002:a17:907:7b86:b0:726:ccd7:4ca4 with SMTP id ne6-20020a1709077b8600b00726ccd74ca4mr24514916ejc.72.1656857923212; Sun, 03 Jul 2022 07:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656857923; cv=none; d=google.com; s=arc-20160816; b=cUwkDJhH8Dtnpkl2jSKset+5wYnDBQkTej9rI2/MSp0G7CXzCcxiIC7dxX59hXBxX3 eMAkojHHvV4FyuXWzCf1C99Z3wPAPkVAu/uZxhRNyAwxgCqxKRmaBCBE7kASAhRdZKzN oDG25jbwy7gJWK4iY2CCVzpkCX5ON1MjPCkwx2p06Ta0R04Hqua9o1Yj1yQI4kzhAId5 J+Aty1LVB88W0xR+t7115qnIAaM9UvyF9DyPxC++KkOx+xxmVGue03uSUNtHax/7o8+H i7yJGK85NnyMhtAegcfR1kEupAyrSnIpwhrs/oXEYPUfPOSRf+ciDwbxj6RkZGHx7SHj UMPA== 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=PLQcBu9cy5XBrrPlEFCobGPj/T4v7w5HXtzfq3YXGLc=; b=djTtp9Yzo78gcnoifJus9F+rOA/Id22cbiTfEIoDMkL5Oc+rO/kI1mY7+EnkR9QPJ5 hDHXcVkmf/pxHMt5Icxr2ow1Nd7BstFc7R9S7J8mcC6KQvIDCof6g0ogkImo53eX4clB igOCFP7eITzgMuGBvP48b7KBQty7z2yZIrs+3OOdUY7fUsxRJUn6Xl0Sd5ni495WOWFL D1/R4reU/qo9Wszw/dhjQ3LIYR+5L0V6iR8o9qPoGGT4E6X7DY1gsT5jdtB3ZVw7MncW c04TVOnkyXYwVwkW9M5gIL3g+qzyIkh3+vQ6AC6aGwg7NEHW/0UGfGw8PURyf9FVeeSM WTHg== 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 e9-20020a170906044900b0072694ef6015si13977445eja.233.2022.07.03.07.18.42; Sun, 03 Jul 2022 07:18: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 0C5AC68B9F7; Sun, 3 Jul 2022 17:18:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39F8268B9C2 for ; Sun, 3 Jul 2022 17:18:14 +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 1o80QO-0087dG-Tg for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 16:18:12 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80PooJRVx8s8U80QOog5Rw; Sun, 03 Jul 2022 16:18:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 80QOou6WmOPqF80QOoCsMk; Sun, 03 Jul 2022 16:18:12 +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=62c1a524 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=yQYYN4lxI-LwPXhzJFIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 16:18:11 +0200 Message-Id: <20220703141811.29914-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703141811.29914-1-michael@niedermayer.cc> References: <20220703141811.29914-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPiXcHc3h+Btn1JIJmTkcuo/ieBiKzXOUffw14VcPtT6F6hQCGgAGtoYrWa+7gomAvwJ4tdHsoMbE9vf+Tv5OB6x2B+T4SIoVJTMidpLCsFE80S/SNAm z/QZpOyGqP7kPmm/tPZC6/9Bp5RTMVAtDj5YzGr6NM9zdxMdPUbsoQclXapJ7OExXLnU4gu7rZz87w== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/ffv1dec: Check for min packet 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: wJnVbu5p7vmK Fixes: Timeout Fixes: 48619/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5793597923917824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 7731c15c87..01ddcaa512 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -879,6 +879,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, p->key_frame = 0; } + if (f->ac != AC_GOLOMB_RICE) { + if (buf_size < avctx->width * avctx->height / (128*8)) + return AVERROR_INVALIDDATA; + } else { + if (buf_size < avctx->height / 8) + return AVERROR_INVALIDDATA; + } + ret = ff_thread_get_ext_buffer(avctx, &f->picture, AV_GET_BUFFER_FLAG_REF); if (ret < 0) return ret;