From patchwork Thu Jul 11 23:34:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp486933vqb; Thu, 11 Jul 2024 16:36:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzttXJhcsbTZwIxbyp/yOybptdhXhyDkbMGgRREVG3HPv5xAsXFpc3HDzSah9HEn8An7y+6C3ERe3cqhKkiCUlsk94StFG0Ede1A== X-Google-Smtp-Source: AGHT+IEttiIfHAi8p4gmel3w+B3yqxXZCI9s7mP0S8J4HingWuspa9VIL/kY1UtT3XQdgJE5Yk9b X-Received: by 2002:a17:907:9711:b0:a77:e55a:9e7a with SMTP id a640c23a62f3a-a780b68a54emr851955966b.11.1720741017496; Thu, 11 Jul 2024 16:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720741017; cv=none; d=google.com; s=arc-20160816; b=aLncpgEJXFGdZn+azX1HW3zBv3YRlzpkbuExuQTmKFEqPbzw7vkX9/+xM4IGTqyTQr IG889VetVidbP6ZGCbYVxB+sQSzRgJwuEMcjbCgUnK31VY/ftELzIDhL83MCpwdhiWvu kVmNq5tLaDOV5ht3q2tm6YMdMG4pzkCLCLyxmeOAloXXPAjt4L2fLCR3+rUIl5d2KGla FtCbNUNE9wy9nvJO9rj333cwc5cM2zUDtRkQIj06YdrA5ogVHqmKSeuBJyNXS7u8VJ4q jpos/BRFJOuc+F1WCSL+IGMDe+sNabVAXWobhTGjy9dqaV5YS9tg1OT30aR/z1vanwld Co1A== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LBcTDzdPPlAKVaX+Zb7CIQmz4raAQdzztCKSJM1odI4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YgQZYaKXXR49Dhy8KawNTS/rb2KhPrCrrbmNFFBbil4+XCU2UGpV3upf4hBjHO0+ke ARiXyHLss2/lvOd/hiy6m9vy/Q4Ejal9cyzT4B9+INGOv/kt00ea8TTdtRgdRpDgEFEQ d/Ub8es40CdHF4ddimrK815XuYqHxbIAabxTijoJnNtEUe/zd1CUicXHZ3MjVurByXwF 9EWntjik6txG1HH+qydoOycc8BdQkmpaMpiBHRpo32KYt5fOhw9mchcm1uY6/Ev2wvUB SVyqkSB2+9tzsou//69ZoDABy2fPMiM2FSHfN/XQSTlUMJfNCEVeSimtwNzPYqhFTxKo PIfw==; 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=VXYwDaVY; 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 a640c23a62f3a-a780ab46c73si358762166b.1028.2024.07.11.16.36.57; Thu, 11 Jul 2024 16:36:57 -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=VXYwDaVY; 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 1150C68DC68; Fri, 12 Jul 2024 02:34:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 014B468DBAB for ; Fri, 12 Jul 2024 02:34:31 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 42F9340003 for ; Thu, 11 Jul 2024 23:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720740871; 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: in-reply-to:in-reply-to:references:references; bh=u9P1psz3oYai5gpshjwZlcvxyYfifZ5SM1Z5aFlRu54=; b=VXYwDaVYpGB3SJE2un93BtdbByXfqYInj+udJm9IsBNpkBa8vyJjNJSOGxbyU2y7U+mCSK OGsI6SnFiTlSyGiT0uU3822VnygvAOH22MZP/mBY2tJhSOh8mJ/smIIA9kHCzTtD4tYEp7 P6rA/Iyuf5yKfZkKBJmXhv0Q9orSVI1flNCmYoeF9Meiu6u2GiHRzzkTXbckdBcOlldSdK lVwBShd3OGCCt/5SmDKMjW6m9KWg0NY6duAPxNJL8GHpa2C8JvVl+0icg/RzfSzHAEmFVi CwYGC6Dl8rJprVejNEVMMGYTKIHkzS8tpBxx2SQ1Num3zEee7Ic5UKFwDS4tsg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 12 Jul 2024 01:34:11 +0200 Message-ID: <20240711233417.1896879-17-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240711233417.1896879-1-michael@niedermayer.cc> References: <20240711233417.1896879-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 17/22] avformat/xmv: Check this_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M9P4DKOPrtPA Fixes: CID1604489 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/xmv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index e103b2368ea..ed59f7b85bd 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -221,6 +221,8 @@ static int xmv_read_header(AVFormatContext *s) /* Initialize the packet context */ xmv->next_packet_offset = avio_tell(pb); + if (this_packet_size < xmv->next_packet_offset) + return AVERROR_INVALIDDATA; xmv->next_packet_size = this_packet_size - xmv->next_packet_offset; xmv->stream_count = xmv->audio_track_count + 1;