From patchwork Mon Jul 1 02:40:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50237 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1519504vqv; Sun, 30 Jun 2024 19:40:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVl2pRwu7LrZGmjbpIxJadZl0TsHW3rjDgKH8fjHmXAzt/QuL4rUkcbolfXhBXEv9cIhx+omdHnWSgYNS4D+b4IWeSGLIgJtzBkCA== X-Google-Smtp-Source: AGHT+IF7J6y1LSunRncWoIsP80LbNs0h79/iWPpaR8LD/aIYSUXVRTsLUsg8hUOPwmz34F4dLVC8 X-Received: by 2002:a05:651c:103a:b0:2ec:50eb:d5a2 with SMTP id 38308e7fff4ca-2ee5e390b2amr28128021fa.29.1719801641721; Sun, 30 Jun 2024 19:40:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719801641; cv=none; d=google.com; s=arc-20160816; b=zm3OC97WHCkmiTzIun5YrH1Qd7VwbC03/5xBc7HkbaxwZ5MBxY5n2kyGi/0pRZSfNv XlBH1wp4VPyJvMDyuNmDd8hp+4DSfjGcPb7ebYa5FSzksOJ98hGMGxLYkfhZE/rrmGeW j2dFyI3Hij+3JjE+JP3fwjnTg0en732tCAcLSXNnMhN793xJNH/WSNeHAPOsWNBHwPfQ L7tzEOnnOMlbuN0b5Zzh0zw+kl2Ec042PZHZS+zjlwuAaY2Nq6PR2t/rIYqEPORCn8MM ufZPwiRcqEl4IkIUHlLfiLohXqTWYMHkFI8kcx14P04G84Mj2V1Q4gK02WeitUIQ5pfu x9tg== 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=YhzeBnRNmD5vduEdb71/gLjvFye0QoOUVTf9ngjAJKE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=DkIZtiLHR+8nVCSg+3CBF/HTjXTLHlgLxsc81rb86SDuqD//WQD4046fam0H+fAIl3 nKcab3J7imtxUY8KnH5CRZzEwEEVPQH8GVifgAMVP9d1Nt6j1th7se5wDWFhDZLEIyCZ NvFsQnW8MUsrOABL9lbG8f0I4Ij0w8SdHy/5d1I7dnf/ndkLd3H4PxgKO9vu7cUp6rJ7 8chD+LUKQuk88qkJP/U8xGiOdLxr2dHK/OXcrMUoJ+n4JDz78UQ/cJMxftUAE0qkjMTM 7LAoSw2J2NJ2jIuc3YIzshcedIdDVbxKJdwpE97JsLqToJwnsmqcW2FLb/5rnEZ+5Rl1 xaTg==; 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=mqeqjkcl; 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-2ee5155ec2dsi16756001fa.568.2024.06.30.19.40.41; Sun, 30 Jun 2024 19:40:41 -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=mqeqjkcl; 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 C6E0068D72B; Mon, 1 Jul 2024 05:40:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F92E68D6E4 for ; Mon, 1 Jul 2024 05:40:20 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1f64ecb1766so11846065ad.1 for ; Sun, 30 Jun 2024 19:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719801617; x=1720406417; 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=tL3nfumZUa1RZQo+Ni6HgWNLWz8LgtbrGwJZ1LFpc2A=; b=mqeqjkcldyGMcNYNe7ciJCAr4GXFAlqTA7Z/La4lsq4Y1CvWG2T1mnhsascLxM1FIj Ux+fYqM1CK7kYuhfDINtdIssxQ2N3BLhjfviQ/Q9+HOdCVtjQ99cyREexesb2yvjZAPY /plICRFHy6/NQZ4SXOczuEyzV+ai6WdYWon0+PKGSIgjLROq46cu1QojBzh2caYyaMST PYakOjcBcKeSigperYn7WfALw/BvMAWnxGKJdwVNHHj6j19MfHXfxAqoefuCVt1ZNFOz elouYbx8ZjlPXd3G2G+9wyIoy7mypNThEmZ1o7FCPQdNfmbeE7Hv9M/Q1uDf+Ikdv9AM CIew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719801617; x=1720406417; 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=tL3nfumZUa1RZQo+Ni6HgWNLWz8LgtbrGwJZ1LFpc2A=; b=PqV5AZAY1UTK3qgtgf3dzbX/NzvX0+QlIOaLO8sAvlz5WuhewZiiiiOwKtM1t7pw3w fslfqQ8siXeV7Jv5XIx0CIVylTQ3gzkes2BvfNwlsFC2zV76KqN/Wb28eTAVb+NFs/JA VNaVG8E8jbDBc3R+QUsVMOawXMreBGT/LyO1bHE/wO/kDH4FR0tg8YUvyjCz5WfXrI3c S/q3NEfw6eY/6eIk5bves3Ah+TXf8Xvpr2+VsBo7Sknk5T5AL7/VoPUeft5WBFQ9KaHg KzLxP8psS2cytWMMvRt4f9zKPkLrbNnjuwONXqnLHhKw+RExyJ8baqGGIpwHJuYiNDfi +b0g== X-Gm-Message-State: AOJu0YzTxCir7MfrmPffeoPpapbU3T86PLxzRVkxSgvTdTLvSr4YFfb/ zzN/7GQZ7biX2jMnaVqS3TwB19rdMpoWrdgApEuXM+peUjRFHAxfTDi22A== X-Received: by 2002:a17:902:e546:b0:1fa:2760:c3d0 with SMTP id d9443c01a7336-1fadbce6a97mr25254465ad.51.1719801617461; Sun, 30 Jun 2024 19:40:17 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 19:40:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jun 2024 23:40:20 -0300 Message-ID: <20240701024022.2898-2-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 2/4] avformat/mov: check extent_offset calculation for overflow 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: ahy1wE1rqTdg Signed-off-by: James Almer --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index fd78d5f59c..3aa2398386 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8482,7 +8482,8 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) } for (int j = 0; j < extent_count; j++) { if (rb_size(pb, &extent_offset, offset_size) < 0 || - rb_size(pb, &extent_length, length_size) < 0) + rb_size(pb, &extent_length, length_size) < 0 || + base_offset > INT64_MAX - extent_offset) return AVERROR_INVALIDDATA; if (offset_type == 1) c->heif_item[i].is_idat_relative = 1;