Message ID | 20240711233417.1896879-7-michael@niedermayer.cc |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp489461vqb; Thu, 11 Jul 2024 16:44:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUt8giVpN4v+ti/p4J1SHc6lMFdxYdY8XyDQpYSntODgN+zLRT5ru8sNgPX0W3BBZ6jbGUQi9y7qBBWH6/sEoN/VRwXvxELBX+GAQ== X-Google-Smtp-Source: AGHT+IEe5YPMSwFYkPwAknTwPgBYZ1WZs+Q+JoGhctJTmptMdOIrNAhEajsaLcUuMbWUUM1uzLGi X-Received: by 2002:a17:907:944f:b0:a77:db36:1ccf with SMTP id a640c23a62f3a-a780b70528emr911067466b.42.1720741459031; Thu, 11 Jul 2024 16:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720741459; cv=none; d=google.com; s=arc-20160816; b=pkxmLPepRUU0SUp8+3QQKthrAtKMlKHeglmIoTh2auGY68RIJXUW2vix47yu+tmsFT RvUoQiBISjpEOkqaZGkyUUO9addTWM8jc87Gk8GpcN+8ubtlml6m4RqdML6XGghiIMiV AuGAXVx2yCekuFOlOVyBk3zjp5I6NdEjB4C0YfQz78ZMxEgsEDvF8DXQvnL8gPX3yKUs nc3EM47AHSHe0MCOlaaGhjKXpDF69Y6ttgoMGGNmHNmnKb5Zpc3uhNSe8SJTusV+dCtn AnADXUOHm8xPHkmrxlAlSLq/SXwxRpa2fNvq3/9GbksDvGL9qf4PkNbdMCVaPi2yhpWS wVJg== 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=T5FZJJgfQAZUoQlmMyOgMyTWsrbgaTMQ67raAAJ/YrI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=OWd3rzIKHEFiruI9Su1Y+ARlp6rNbT4uP3c+6gPT9AU+h0dR8VzSKCWYnr1WOvTEjt Cwer7LXLc/gVJ//iePgCCo9/hP6BuiAPf9IKmUpRSAQX24BLH7M45H6hLYEuf02RAosA 7aEmUz+a+2eyLmtBOB7dtEhb/oJlcDHU6CqGGoTYIX2H2FieGe/9MgdM8f0C+/4XDche RQIHuCPq6KFgm3yH9o2+HqELJbbV5xoP/Ref7K57V6x8IatSkBaAlCVhuWFHT9rDrs+9 pj/XXPdM6EYqmk2aVI0CrZOClPbjmCApc+hzp07TdHF5Gxwm6c9wWnHjiS8iwr4uQyx8 cIvg==; 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=CZmmUqXZ; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a780a9c830bsi393523166b.71.2024.07.11.16.44.18; Thu, 11 Jul 2024 16:44:19 -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=CZmmUqXZ; 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 306BB68DBE2; Fri, 12 Jul 2024 02:34:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8989168DB30 for <ffmpeg-devel@ffmpeg.org>; Fri, 12 Jul 2024 02:34:23 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E8FD71BF205 for <ffmpeg-devel@ffmpeg.org>; Thu, 11 Jul 2024 23:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720740863; 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=468tw5Go5kw7TbCF5EZoiXx+0biyBsNuTNAMo4G8PMg=; b=CZmmUqXZ9aqXEEoplVb1RAsmcR8gUfD/ZvkAAvhR/J4v/hqPUZAkfdKOA2fMNDmLItKEvr wrCiSqt3BJwRhPOpunFkK4OXPTgXQIly38pKq6G+PRf55PytFVkJg6SLM8wK38933in+WJ kQSkQQUF5D1r7youwniiOJruWOIEatwjVeALjMQUMvX7JeVNl2WbiUti6mmc0G1O1L7AFB Fm6JMv7vlgsGAlTUn9KrqMsoDmxBI7CLYRM6v/dya2SnT/Q2Jo1IJ98DBuPWiDD8qBteHI iig4eqYSGoOk4ZPvzzNffxu162qiXjdXCZ0xBMF8Au54Vbu7t0i9KhyYQwc/3w== From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Fri, 12 Jul 2024 01:34:01 +0200 Message-ID: <20240711233417.1896879-7-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 07/22] avformat/mov: Use 64bit for str_size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: d1O+SmarnGF7 |
Series |
[FFmpeg-devel,01/22] avformat/asfdec_o: Check size of index object
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavformat/mov.c b/libavformat/mov.c index d862434d256..7c33c4477dd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -333,7 +333,8 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) char *str = NULL; const char *key = NULL; uint16_t langcode = 0; - uint32_t data_type = 0, str_size, str_size_alloc; + uint32_t data_type = 0, str_size_alloc; + uint64_t str_size; int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL; int raw = 0; int num = 0;
We assign a 64bit variable to it before checking Fixes: CID1604544 Overflowed integer argument Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)