From patchwork Mon Jul 1 02:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50236 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1519467vqv; Sun, 30 Jun 2024 19:40:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKjInvXxywNUgUL1xvR023SI5REjcmryHPeFKTWgG+0tsfZGEwprGfcGo1Cvh6zrIMEpN7KO+EBxyFLrhSvTM88bn5VbWdc9ab/A== X-Google-Smtp-Source: AGHT+IFh+0q8NtB1s3/XVF6mLKlw4PJQnd0r9QCNZi8KGO18eNomLkTGqE7YR4ZefZFAK1yM3brL X-Received: by 2002:ac2:520c:0:b0:52c:dccd:39aa with SMTP id 2adb3069b0e04-52e8272f630mr2392228e87.67.1719801630740; Sun, 30 Jun 2024 19:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719801630; cv=none; d=google.com; s=arc-20160816; b=wr4Tuv/zkRnnXN9lACGH9/KuHu8fJKhwSAxpR30A3zaYx/1cz0MIs40V0A12Whzj0P dxPVpppnW+NTprWcWIMAqM4hN53aRDmF3EAvXKOaWjN4XahtbkoWTDr4woZ5+xSlz5wZ +NYlf0q501ekn0rttEcpcDd6KglmiyhOJ+j9HHjgpk6WCs8inkErsPBQhEAe7jVMBu38 f6gmD0hkmTd16juTcsGKffgTEgMipVN0awlmhFlKAJ3/Dnw28rFOiUAln3H6pcYdwVVG HWEvPZagi7XANqK0BQp4qAz9x7PefMLa5OXpVQVAm3RE+1wm21uwJ1+pxC9vDc6qA6Jz EJmQ== 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=N9oQjOzGwTtmgLOURe70FuksrqKzw/k+K7x/iGKgoE0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uzd9aOz4NgndEpIw1IxQ8jQyGIj+sE5mxoojPEajfjZKlecWgPoXa3JKvbIfyCvpWp d3rigT0u6KA+zujPEXsxnU2yAdPPzgvPanV7HPO3ON61un0DeSn2sjKywddUbm3n/b72 t3vUDRH5IeerTT9MWq2dBMU4f1u+dVruT6EJDK13ybUootUodDBgGFzW0m4BTkS4DIZF 9Mn6lya4oxDVsYI2noVaVLEoblq7cnV6mX2nL/M0G0D6Mfj0Y5CLyq2ITV8wtnMse4nq JzuZkg826oHnindQs2/gF8hEiyMdOunJlGkVrAz23R5SrYwlBjLzua/wzk0sisN8ydp2 uoxw==; 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=WdpZ5pg2; 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 2adb3069b0e04-52e7ab0e274si2026941e87.137.2024.06.30.19.40.30; Sun, 30 Jun 2024 19:40:30 -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=WdpZ5pg2; 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 1A5CA68D695; Mon, 1 Jul 2024 05:40:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3FEB68D695 for ; Mon, 1 Jul 2024 05:40:18 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-70673c32118so1404063b3a.3 for ; Sun, 30 Jun 2024 19:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719801616; x=1720406416; 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=pfiO5Q+rrDZ8MYJmR2tMvR0dvEuKvIVQCqjUAHxEl80=; b=WdpZ5pg2delHUVYCgbFZPXuqUnJ6dwNeHfU9aWqdjnfTN98ebdi5AZ3c11aQj52WNA aqIa+qiYqVK7ZZ4StmMrCOdeuMnsJsvhlmLPpb7xpp+NV1XgORPcwA7N3DVIimXLGeY9 LBA4SD6uz1C/T5r4TjYgjISLMknIRbiZqcczd+xnsZ4J557dofUclcejyQLPKN46fcfx 2HTM4mM8UCb5iYUCkpiMDw3kntw5Edja7z36G1y2EykX/d+NKFBc9sQOJOEPDaZe2uJE NhXIgKY5luyJxMSipiGu5cOpdHJ4IN1P2nYEgmwaE0vBsXe8efuraKusN6C+crYRY7br TM+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719801616; x=1720406416; 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=pfiO5Q+rrDZ8MYJmR2tMvR0dvEuKvIVQCqjUAHxEl80=; b=hFBxToics/d324f/eBLBmU0wpu1LLG0czz2OclxqvxB1VejMR2UPyntjNSHfPFhX0b I7h+IMkhu7cIKCOZqBYigIX0sGbx0U3+8T8pVZAKijfyaW9kkASD8iqVhgCq8uULWEzq pWCNY+gpTlX37NZdSOTY3BLNhmvM/Bhi2Y7YvzWnZgRkNhd0puNw1EfnHmdt5SjqL83Z 8uJjMhWWEvGasJCGl9doEcD3i3mrv4Ba6LJxZkZD90mXgN5t03L8S5wDV1oYQ828J4ET 7eNJ94ceSByNOutbPgaqBxsm7sMRlvOsoOjiI2Nih43M4tYjzwn3duv+xK3KkyMaM9c4 +/QA== X-Gm-Message-State: AOJu0Yx/ov354js9Nonfe5GlWWwTxyoS/d6EW81oy+EBcJ6Wl5cNlNrl Ur3Pvh1IlInEKNthuk4jvktlTPo4dzCUTc3zmjUg30aCGdrOwapOKyCKww== X-Received: by 2002:a05:6a20:bf1a:b0:1be:cd00:8248 with SMTP id adf61e73a8af0-1bef6275a75mr2394527637.52.1719801615612; Sun, 30 Jun 2024 19:40:15 -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.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 19:40:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jun 2024 23:40:19 -0300 Message-ID: <20240701024022.2898-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: check that iloc offset values fit on an int64_t 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: 77wB/6xgubGZ Signed-off-by: James Almer --- libavformat/mov.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a2e187ff2f..fd78d5f59c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8388,7 +8388,7 @@ static int mov_read_SAND(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } -static int rb_size(AVIOContext *pb, uint64_t* value, int size) +static int rb_size(AVIOContext *pb, int64_t *value, int size) { if (size == 0) *value = 0; @@ -8398,9 +8398,11 @@ static int rb_size(AVIOContext *pb, uint64_t* value, int size) *value = avio_rb16(pb); else if (size == 4) *value = avio_rb32(pb); - else if (size == 8) + else if (size == 8) { *value = avio_rb64(pb); - else + if (*value < 0) + return -1; + } else return -1; return size; }