From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5A4794BB06 for ; Sat, 1 Feb 2025 01:34:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D63D468C1BA; Sat, 1 Feb 2025 03:34:11 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 342BE68C155 for ; Sat, 1 Feb 2025 03:34:05 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-219f8263ae0so49197075ad.0 for ; Fri, 31 Jan 2025 17:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738373641; x=1738978441; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=AlDP3ilI9JPjogTe2MaIj+yR/Fvg9wRIKkZg6eXPt2Y=; b=MOzbtCJ3LIpKAGR1dIzXoOCcdP7o3Df5jLy8fk4WKxtkoNQXwzQ1B5EdDeYkhqYShb VZTe2Q1IeLwbX3uSWOE/ibmVrUQhIciHuMxuB4YBLXydid0slT3kvo8GQYJU3Z6f6weT 2bJmLSEJ9gZK7rHe817Y5K2nE4UVI89xPRs7yhW9DpTu7mJ0jjXlEruC4OoPt8tYxlWJ ZsbVWnxvRF6R5NQY+6wkI0xb2AH3GcGrZhQvyfCM1EJuHQ4PtxhQkVuXNQ9xmhgkZJ6h Veq0szE8sfhuPu4xy+FaNhkxF2zMWYut30avXIVib0C04mGiMxmDKBfsS9huOJd/U5lI GtrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738373641; x=1738978441; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AlDP3ilI9JPjogTe2MaIj+yR/Fvg9wRIKkZg6eXPt2Y=; b=pVQLwLXgaMfABnWoiWKkhDHzuxNcMTt4514tu8WZRWLHAP54bwDym3+G/aTBjfTMzK Pipm7js2gCon60+B7O5CwjbIKReLdPO6031pyyf4u/XWyY/uIxCS88+EcchEnvI+mu0S Ei9fW64pNMfr557tLCDraPojMr1DjeNxBZSfXB+q3iobbgmdV4Bs0hNzFlJtQuU+yhwP 3jviE1H8XVqDxfSy2j3FTvqTdaUrJKE6yucw8rN/kfPmxaTGElXViMjX9psvOY0ZDNSL Hiz4fYouD6LKXQJMk0pl5e9TJnCFJyB658Y/1zhm08hieDwk2uu+m2B7a3lHeb/uXMxY 3tzA== X-Gm-Message-State: AOJu0YzhUHd2B134ZzF3Ebok4qEfKv/vWs0oqkXrB6KGj5GYdWtIvstA MU4U8fWeSezSx+wEAm4TQ4eNrVzC7jVW3kn4JQUU+3oPYygsuEzo7M7nBUYT X-Gm-Gg: ASbGncuRyjrc7ktijsUeHOMx7j/5Nz9n7ycCkbKfN2Cs7TBeu7REzrKoBvIzQ7D6yyi Yn6KEgZ1E65GI694/0Uj44uuLFWWvTjzg7KlPxsS7SGRxgtoyCiJ95JoeJiaVawNRbkdwvlmUhX xeMhtMFXT5+44gy6/mkNZ9n5L3gPM4JgHn2jJosM9CIlYVFdR1ji2HT/dcKwzTsOS7olCJzyXaR 9IwIH109Qu+JQIJsy0R4mCieJ0xMQRoCp+CmIW42+Pa+TiSjKfW1OuBcc4NngHiSrlNBPsdK4IO hsSgg4/Cx+9h0VFq4TH2ZzhE0DuXWnHU X-Google-Smtp-Source: AGHT+IGke0zk273TnauZodtF28rI+3lsxip2akSNTu6EVK2c2kStuSfdkfu/wfnfxjyuGQDeiFOBcg== X-Received: by 2002:a05:6a21:6b02:b0:1e0:ce71:48e0 with SMTP id adf61e73a8af0-1ed7a6f9345mr21527492637.39.1738373641434; Fri, 31 Jan 2025 17:34:01 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:aca0:6b6b:5a40:f8fa]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad0aa1f7421sm1059054a12.39.2025.01.31.17.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 17:34:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jan 2025 22:33:43 -0300 Message-ID: <20250201013343.24029-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix parsing lhvc boxes with no NALU arrays 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Return if the box is empty at the point the arrays should start. Signed-off-by: James Almer --- libavformat/mov.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2c8be51063..05afda4169 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8435,9 +8435,15 @@ static int mov_read_lhvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) num_arrays = buf[5]; old_size = st->codecpar->extradata_size; - atom.size -= 8 /* account for mov_realloc_extradata offseting */ - + 6 /* lhvC bytes before the arrays*/; + atom.size -= 6; /* lhvC bytes before the arrays*/ + if (!atom.size) { + av_free(buf); + av_log(c->fc, AV_LOG_WARNING, "empty lhvC atom\n"); + return 0; + } + + st->codecpar->extradata_size -= 8; /* account for mov_realloc_extradata offseting */ ret = mov_realloc_extradata(st->codecpar, atom); if (ret < 0) { av_free(buf); -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".