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);