From patchwork Sun Nov 6 12:34:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1530101pzb; Sun, 6 Nov 2022 04:35:25 -0800 (PST) X-Google-Smtp-Source: AMsMyM4hZKUnrDF8db7Boc14JMYlO1Pn+FMjLZf7GRVCZ7hY5lGOx55SlQgpWFBCNvmAiJkuOWVZ X-Received: by 2002:a17:906:80c:b0:7ae:7b1:df51 with SMTP id e12-20020a170906080c00b007ae07b1df51mr20922364ejd.651.1667738125560; Sun, 06 Nov 2022 04:35:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667738125; cv=none; d=google.com; s=arc-20160816; b=QMGsSp8Jp2Jo0IbgeBLOrNwuyYIFomxrvTzcZ4owUMAKFCGLAgXrW6JgkdJg2n1P21 8sGiQbd49Mh1gWIVGp9IX3KduLmg/Xhf7Lw2pvc8/UfaUx0Brvx2G7tnPCVVDjDze1MX gAM17R8QIYoXh9ZuLJ/2MKogSazQsb4t8Gf2yDNHQ2pP/ggDonRnBOAhzeU6vRbbDlUq q2foUuCMF8UAKJXYom+vFct/rnEqFxLZtBWNvoLvP4pIE1gBabiMIXE5YhovQ1vhYWZr W/omQpVVuRe/ae/5f+sZoQxXubCAeWCbv0F4CKjluh113E7NCKs0NMjLGIUYi0zRSXmN 7p6A== 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=Hq11c58pwzZVhq6OyTYeDyul35KMU2F688nSZ+jDlaI=; b=HwVGzaOI/g2OkaHLSF17aEtv85l4ZRO9uoGAgEUPaPw0Pa3HMdHYzwZGMr7HP9geXL n9CLbPR24vOVGu1GMa8K8taYhiDob8uuJwRP7LmpxWFrcL1Dv9keUeK238jcDuN7EIHe yvAP+DVvgLb1VHgFNoCnjQXMpUlP9/jNiaIbaIfXVRiGxYUq0qEdgM2t0TwrirJaS4sJ cTmM2P2rCZDMbP6FkMUlRe65HtmPncG+IrooKRVQDGfbukWlBBmdhYU/Oo33gjEBWl4F HMeOohf308CnJNc0BHAxfnbp48rGIZLAZXQ0Imnb1Zn4j7uZ9/Ad+tzIjehYjf1t0Ehx wohQ== 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 g22-20020a056402321600b00457166171c6si5806892eda.432.2022.11.06.04.35.23; Sun, 06 Nov 2022 04:35:25 -0800 (PST) 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 35B6868B7B9; Sun, 6 Nov 2022 14:34:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 438D568B76F for ; Sun, 6 Nov 2022 14:34:42 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 3BC591C0005 for ; Sun, 6 Nov 2022 12:34:40 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Nov 2022 13:34:29 +0100 Message-Id: <20221106123430.1668-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221106123430.1668-1-michael@niedermayer.cc> References: <20221106123430.1668-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/bonk: Check step against overflow 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: qsvFWTmJEDjZ No testcase Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 37ad7854b6..f2427de4f1 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -180,6 +180,8 @@ static int intlist_read(BonkContext *s, int *buf, int entries, int base_2_part) if (!dominant) n_zeros += steplet; + if (step > INT32_MAX*8LL/9 + 1) + return AVERROR_INVALIDDATA; step += step / 8; } else if (steplet > 0) { int actual_run = read_uint_max(s, steplet - 1);