From patchwork Thu Jul 11 23:33:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp486076vqb; Thu, 11 Jul 2024 16:34:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7g796VL/dEyEPgsOf7at2MPyBgISDqWZdIbnkzI+tudrKoy7oLuzyaoYc8O+P+jrR95HeaVWEqKJk3khH++bMSQXdsqUtKHrO2A== X-Google-Smtp-Source: AGHT+IF2NJYT4ElTo0t4E/OI1ihfFO+x7RTWGhrkgNSYeuIqqgqvwumjz/UEYnUdUhXy80ndZs0i X-Received: by 2002:a50:d518:0:b0:585:437c:d7fc with SMTP id 4fb4d7f45d1cf-594bc7c7e61mr5994500a12.32.1720740869537; Thu, 11 Jul 2024 16:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720740869; cv=none; d=google.com; s=arc-20160816; b=n9kqGG3f50o8THQEjm7RoVHqhzAEnJsJdksEDaE0DTG0PaPU23+PEwyW41k1bsEXJ9 h2J9NpICOGzIpXbMOfL8TYlCfF8lcTuJpUFYiq4lRonPP9UfivAIRPlT3ymZoYS/9cq9 r8WvtY1IZ9qP3nmy61LkpSDtWomRqiX0mhGfTZtXTY8Q7UsrkyR0cgB7+Hl10byYfr0d iOuA72NotkAi8PWl5SgfC92fmzeIYbE7WosXl8E43DT0sotCNwCGY7fQhlHolpAcDf1G XYlxEQGpERpduhcqPBJdO7Pr7PvrXLfcqDVPzk6hcjWLrQ4xVPjzVZ2nX3UstD78z3JX k+Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=eEEpQ+N9SkWg+0GV6Cm4EpB4VecMC894GE+AdjLA8q8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=njF8Ic/qv/T5Lpru3nzz7BdpUzvL0D8sdWtCRPmOwOlwa5JbAf5oAHZYYE+aY+GPqQ xKqBC4nsrH/hdCH4mxdzx8/M6l48pQEPX3UC1rgbOG6ispheWdxPyaLDxD5Y0aluaO9Y P3gbtKZED+xROluhY+rOUptC4G9N8ckmBCvMg0MdjhynhWSHmMuOgsZfw0DEjLLs4Pc0 WVgXbg564SYiLZXW4LXPQDAABfyUxxz/MNlkPQaiAqFzJk0ee9EovMbnmHeaYzcvy+Tm 9/Ni+3iiK7kS9xg70CDVGklmzCH5S+RUDpcEWgFMy56JfueZR2g+WJfpYAZV60gYToSJ CKEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=pcipINZj; 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 4fb4d7f45d1cf-594bda3bd50si3632865a12.267.2024.07.11.16.34.28; Thu, 11 Jul 2024 16:34:29 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=pcipINZj; 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 0D90D68DB25; Fri, 12 Jul 2024 02:34:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D530168D9D6 for ; Fri, 12 Jul 2024 02:34:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id F27A120004 for ; Thu, 11 Jul 2024 23:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720740858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1onBELY/6TQ7+H4w52aoBsx7kPNFt2nn2unC8aw3rvQ=; b=pcipINZjvQtdJK+cONNvXGuHtfs2gT4uJjfnSKwLNnuS7EN74AA0F9r4w/gEZI6CaJcvVP b+9udz5Mk9BTWBlDG5s/wt3cF0lCy0b4JtmEsf3z4JpNXBkn557IudHVLWa6v83gOSx/sW e5xDIufAu+8g+1cTOuD2iBTrHxZaIw7oa0vV5+aY0ShRVvq7kFmjdEehkA/8boV1pgTygZ gHYxaPB64m0ZJQ2AWxaBM3G0w3e0Z2ekAV9goCWPOYuhL0YXNQ7Y9GRcdlJEOMOE5nWDbP MvFXStbjTZyF8bPCXiMTvFDSO+9xrvutjQXJDybBLZa7irpmCLWbkkthFuJsNg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 12 Jul 2024 01:33:55 +0200 Message-ID: <20240711233417.1896879-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/22] avformat/asfdec_o: Check size of index object 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gGfcznRw0nVm We subtract 24 so it must be at least 24 Fixes: CID1604482 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index dfe448e9f7e..dd187e600d0 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -867,6 +867,9 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g) int64_t offset; uint64_t size = avio_rl64(pb); + if (size < 24) + return AVERROR_INVALIDDATA; + // simple index objects should be ordered by stream number, this loop tries to find // the first not indexed video stream for (i = 0; i < asf->nb_streams; i++) {