From patchwork Mon Jul 1 02:40:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1519538vqv; Sun, 30 Jun 2024 19:40:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkb1LStXpm/kpqGIzvxlLUOAvCg4nZMXNUnMmd0I34VPTwUrsB9L1bqoux0EZ5cQadVPyYw49UsO+cnYKGqjH52sGBOUkR09RvzA== X-Google-Smtp-Source: AGHT+IHwuTi6+bnXb7z3zgnPRfq314kB+PEZC2nEGino8LfLz+PP0UnnG8MDxBmMQdd04T8zfSx8 X-Received: by 2002:a2e:beaa:0:b0:2ec:5668:3b93 with SMTP id 38308e7fff4ca-2ee5e393845mr40140151fa.12.1719801650676; Sun, 30 Jun 2024 19:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719801650; cv=none; d=google.com; s=arc-20160816; b=TEbmDwKoUG21yErpjBjTqCrnhKTeFFMgXSPCBRUwjr91fNBEcmOKfXarczXCtsHU65 dphaFDsez4lIHioSO89lRuOUIsV3p6qqdB31qkfoh/YCgkm9L5D9g11fdIeaItkJG/6/ qpPbNz555FGYFCh648oosagfOHRDhN99RnaeznWmyjEMVuc/8HT9WI1fbkT1TbzYaDTk SoF0e/sJvLL8jU/6y91XfAkQSDKUEON0dm7dbpZPi0TlPAJcN6PLjOEhpNgFcpIQZAHW GE6iugSr4+AG84aMxxvvLgNtM77qLlEvG3ftC7Ey3P3uCK9IiFYrzf9O92BmRks9imUU ahQw== 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=/xQNgs75aWnNy5BdOxe3xmW7wMvM4jThNMZrzAWTuPU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=t7pN7gbuyB+hBxRVkWbkbrYdb9Bopt/5nOumztTLHaf8tdmyyYvSK02rXswu/tCXxs bxmt+qjTtthuSx4X2whqllOtr4JLPle8GudnnvHP/N093WN/Flcc12ih2oHfCY/i911c gqIJwb7r8qkZ6wDmiZ+Vvxw3AkBJzDOjpMbPlwjntHQvoYL+rLsINXCiKEI2c4zLDNgJ kKR2B8emzfUmhf94IrvBsjBxmmmLikCxCa5iOaXRyw2/J8/LitR1uPh4uefOW3ghn0SK 2PouwNqmyHDN7I3lRBEZptg5VFK+LkD8zIiCHm9wKGlcDTiBwEw4jxQdD8LVa6yAegAv 6jaw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=IXBgI4cv; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ee514c0094si16446851fa.8.2024.06.30.19.40.50; Sun, 30 Jun 2024 19:40:50 -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=@gmail.com header.s=20230601 header.b=IXBgI4cv; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBDBD68D759; Mon, 1 Jul 2024 05:40:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 305DA68D6E1 for ; Mon, 1 Jul 2024 05:40:22 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f4c7b022f8so17606045ad.1 for ; Sun, 30 Jun 2024 19:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719801619; x=1720406419; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9FlViTwfKmOL/ROA/Xb3aAaJWBIwX2bbBrwEycNSwvQ=; b=IXBgI4cvD4jaYlsBj8bczr/Wj/MVBYdLAScj/eQ2eZFSeE89sjfMS6yqGzxCX41co9 rQkbjXMALXsMiUiRDkBUNnKUQbf+RA2ZKdBlcq4Set32QDZjy7SWBTN9VmGNMRh9/rYp dz9u7JXCNtmpBpJUQEkPE1Hn8T0ZW8KwTet+Ox1MMRpgMsYbUYLnXAx1Z/Ydes7+nCoG MNmRKzamYv/29MnzgDyCfM0dmnu3QmKVaODY2nCaZ6q9ms4HGFg4yxGkSYzKjE4OiHfo HZKjFrI2rj9sAzMsGmDDPIIOMC77DI0xw/QurWebMaizRw0PGDTEZ2bFG3cJC5i14i41 TjGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719801619; x=1720406419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9FlViTwfKmOL/ROA/Xb3aAaJWBIwX2bbBrwEycNSwvQ=; b=HS2S1b93GsY7t9fsnQCWrmFM1bfXVWTaBrS8QnsuYRJ27M8wBLSgOC8d3CvBpc7XmV Z9dZkTMoYPm3gW8Sr/FuST/qJE9zp00nVLN+owtmbONn/E1GUl3F2wFqcqem7VKTSVOr bi3cJUfu156RUB2M5aYOuAAzsT+Nc8NyjJj2/QNyhGvjmg13ynd9b5BAaVgNmc+4kDtG TMZCiFIeaUqr3w3trkbOb2ARDHOyGwCN0m1daimJHdHqkFbGmerLaH43OA4koICoJNYK 1TbriDRtx+71oeFUeRB9UmiUx+ldvUFZzMra8bRYN6l8r60OBd8KftE81Ultvd3ht8EB WnGQ== X-Gm-Message-State: AOJu0Yzg/5524D+rV1sDpsWQAZqWnzBCf2bpeXudXcd935wfglt2Hfll IdcP+67GgjoO2U3Zw7ipCmSPxpP52Oq35ScwLlCQK3gpvny9BEXYuO+6qg== X-Received: by 2002:a17:902:d4cd:b0:1fa:ce44:1c6e with SMTP id d9443c01a7336-1fadbd09046mr45413155ad.69.1719801619311; Sun, 30 Jun 2024 19:40:19 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac1599d9dsm52776115ad.292.2024.06.30.19.40.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 19:40:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jun 2024 23:40:21 -0300 Message-ID: <20240701024022.2898-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240701024022.2898-1-jamrial@gmail.com> References: <20240701024022.2898-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mov: check for EOF inside the infe list parsing loop 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: HyhylZ0mACbj Signed-off-by: James Almer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3aa2398386..9f6752b492 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8580,6 +8580,8 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < entry_count; i++) { MOVAtom infe; + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; infe.size = avio_rb32(pb) - 8; infe.type = avio_rl32(pb); ret = mov_read_infe(c, pb, infe, i);