From patchwork Tue Apr 2 03:17:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47723 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1113280pzb; Mon, 1 Apr 2024 20:18:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjGKfL4jiSiOPMtVwO+qG6+Pq5Kz6NQ65NhgZXkHc0SpyECjulaPq9ZlfVk3QK41GMep6GptS1WbhrmuFuqqa3oegpwpNLUeJMCg== X-Google-Smtp-Source: AGHT+IFV3N6TaQJxekuvMr+4MYxDk50tSFyXMl1KKCRPFNdBovggyu92XjIwlzM5+CPvwWDRrKR2 X-Received: by 2002:a50:ccd1:0:b0:56b:d1c6:66a5 with SMTP id b17-20020a50ccd1000000b0056bd1c666a5mr12778155edj.6.1712027893475; Mon, 01 Apr 2024 20:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712027893; cv=none; d=google.com; s=arc-20160816; b=oLx94I182HPHTpQLxMdQiKAY204UczIib5sWjgzPvxR/uXHFgGPRgNxLg55cpZ8jPe UpUxPqzHrgOGGugIUX6OeOPUm45nbTr2QcCJ715nD0PBUZ6p24QD7gUc6fKap+tT/BFv OwradOL5iOi/Y6O7XxH2FXb2zAEYI1rcMsuXtux7b3BQZuXVA8loZYA7MKc2pSVAtpP8 H1luvTBTAs90VS54UV7nRrOJClC56rdy55nMvpW3mzdO8RmSXVRRSmbpgumBZJJb1Sz3 4Y4Fqvbkp3uuBnZhvXHqzLxV0wznIMh/JTlWOluHsqk1nGVszuoXw71blEkBIQgTF1Qf d/kw== 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=fKh11txqGhQOO6m5Mw47sz+bU/qrj45bthBPFKKYCmg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=NqTIOmAkuZUH22wJo4cWcCcZcaizneZ3/Xc98TWc3/+dIGIpOpwhoRc3MV6+gHOygg rmR2CX3qb0wBPM98UP8PnAW/XxdYEKNwydnq498gRH1XMgglKhqv9QCQUG01/DLTAz6M gluLvm7G1sE4lY9o1NDHqwPxTxv3eXY7Ubq9gT1/DtV+2I3QCJXfFrgHhOvkcJobwyv0 FRAsLYLR603k6jsXpLsOMebCtscesW3AxCWf3kAUNO2fvXcQ8AYWW/n4fryYoBmZvN+6 c2mDDGsgtAFUdPPNlL8IQt9afiRqS3Rf55ICeeVsdY6Fxloz9GSGg63xNNd02d/tZq05 WVqg==; 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=DIMiJ0Bv; 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 t1-20020a056402524100b0056de760c649si229708edd.298.2024.04.01.20.18.13; Mon, 01 Apr 2024 20:18:13 -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=DIMiJ0Bv; 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 16C7968D0A4; Tue, 2 Apr 2024 06:18:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1275B68C1D9 for ; Tue, 2 Apr 2024 06:18:04 +0300 (EEST) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso3213013a12.0 for ; Mon, 01 Apr 2024 20:18:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712027881; x=1712632681; 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=eqLbWHNRq+DXIzxH6h0MXJIztTG4FUkvlqvr9Ry/c90=; b=DIMiJ0BvyZKkcfeZOagS1VQsQnn/tAA8NMjg82GXQA6Iz8xczrkiqTTusueQz8q8x3 SmYWn1omm2nFlEx3xx498mXc37wlhyyFBblEXKDCLuhbhrGvuy8BhgYXj7gH5npm6HZD 407nyYvxAme7XJn5B3pg77GTnz9xyV4VjxBmQdzQAWGw57fnqG6ZrVdRsfjzYUprkJkR SgKHTC3/4HrOsnEVJakpTNidJtWSkfd/CG3U5k1CigcNT3bytsfGlWytNc65NfcPbPFo wSI4uzBbpyII+hq9kZwFlD69wagmNgKVqr75C6XqkOmTd2s7iIr8ycsmiHN5o5nBCQtD BW5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712027881; x=1712632681; 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=eqLbWHNRq+DXIzxH6h0MXJIztTG4FUkvlqvr9Ry/c90=; b=kaNxN+mXDrdkriVuCIJ4/XvN4Ujrh44owIyz9iG1ucbU9xPv2jg/Gsem7F5cfVLBxP KWF8RdMUXAlGPJ2denX05CX09ox972YYYHDab8jEusPlS7FRIfxoU94nTjh7QVISounZ fCF4gpFzpvLAwhaMhaukpIY30nr8sckPypGyyZsUucYiMnOUKzXOGMSx/aj+sty43Q/8 V2sOfl8d3bmmBUE8U4AINIfwYe4YwNTxRdfgW0+kgf8YpJ3w2+K8LYNy7XZxq7o+J0qB KJVKIVpFavehK84LJBnZSsI7FXtcXHAIn5/9Z7Uw6URao8Ox61jzppTEVmsogmqzDjKK XKrQ== X-Gm-Message-State: AOJu0YyaElrFBHTUDOdSB48kqoIXLnZhDRxEaUCYvZJVbxNRiBN7WlIS PSRH9/9+h3T63ZeebrMWXt57MdfjnB7R36FZ4KuGQ+XgqtTLiI6HbbVw43La X-Received: by 2002:a05:6a20:7491:b0:1a7:23a9:2600 with SMTP id p17-20020a056a20749100b001a723a92600mr99861pzd.59.1712027881343; Mon, 01 Apr 2024 20:18:01 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id g12-20020a170902fe0c00b001e26ba8882fsm408652plj.287.2024.04.01.20.18.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 20:18:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2024 00:17:58 -0300 Message-ID: <20240402031800.7159-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mov: take into account the first eight bytes in the keys atom 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: nsncLTm6y6TO Signed-off-by: James Almer --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2b7ddc516c..3273e2e89b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5024,6 +5024,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_skip(pb, 4); count = avio_rb32(pb); + atom.size -= 8; if (count > UINT_MAX / sizeof(*c->meta_keys) - 1) { av_log(c->fc, AV_LOG_ERROR, "The 'keys' atom with the invalid key count: %"PRIu32"\n", count);