From patchwork Mon Jul 1 02:40:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50239 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1519587vqv; Sun, 30 Jun 2024 19:41:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9ZBjVK39F/x6gtVRwsyZkMMc0MXloL8q5vfdWJRXDrAfi9ziLGxdBvHRQrU2pl7Isv93MtAJwQHCzp9z3vZ8w3Ot3k/gIeCqrVw== X-Google-Smtp-Source: AGHT+IElA3EkEd6dIGvbytkEP2Pa3au1j14cGNVmVAuvD7CDFDtQ85ih4YQomnIBf1pOmMlYXcqO X-Received: by 2002:a05:6512:ad4:b0:52c:5254:b625 with SMTP id 2adb3069b0e04-52e8270a66dmr3648261e87.52.1719801659535; Sun, 30 Jun 2024 19:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719801659; cv=none; d=google.com; s=arc-20160816; b=Ub5Cx5M9Z5ApMr6vmTJutzdBiwDVr2Rvjadhl/OkNx38QaaoAqYXfLeEaF3zNpJEuc XV0cvF6VQMFKn+B4/i/dgjv547pKzuHrOk/ZHx7CMDgHUBeIBZHiBFKzM0a75E3fkXcy d0Lwf5EE/2cfu0PkULeegplPBeB6O48faknQMRGiiRCZrsK90AzERCAe0SpJ9TSYvAoU xMNSVnh5dgAXbitAlT3PqUaWg68JSjdCMadiStFsPE3f3ItqW/DOmVVE8cmhHYWmvXg0 rlwIDC01c3EhIEA3ci1GtpcTMVL4/6Nxmc6rYZcIqV2CmmqV2mQZQzLYRWgMLsTL4Ryw u0Qw== 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=4zVi7jUdy0XgqvKc6YbcoNm43xCfGm6CMw7zkSdD9uQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=daynVZ6e1p/HklbbfpqGG4cgAo8x0A4h0c6kNlU1/oxOZLgAjld3CnUHEwqv3Mr5OQ YT4duyTFzUiYVGY+ULHPJr6UNfs6bBfvx1ltB7h3iVcT8v7jKBFyoBzHxEKkThOPD/hV tttuAJ/I2PGsvi4MfUijN11p2cXqR6MjGOqTyhYJ1ubiUUHn53XGzTmA2oqu4BJZS9oi /KaASHmomLMKMPxoFHrK+0uh8vc0uKGed0Knk7rEpOmKXANoQcsLC3emXQVd8NPYQPpU cB9MbApK450pU/QuzxA8S9KTp+5h/3xP95jjhIGCYa5jB7lGykOor3MH89ZdkjZv49xy gccA==; 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=ZWjOaFkM; 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-52e7ab28b03si1978631e87.329.2024.06.30.19.40.59; Sun, 30 Jun 2024 19:40:59 -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=ZWjOaFkM; 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 2B56C68D778; Mon, 1 Jul 2024 05:40:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 D6CCB68D754 for ; Mon, 1 Jul 2024 05:40:23 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1f9b523a15cso15591675ad.0 for ; Sun, 30 Jun 2024 19:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719801621; x=1720406421; 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=zxGXeLDTWwJrQAuOo1mTnHZzykRZups2fU/jBOYflxw=; b=ZWjOaFkM0Ke5Cbh1CpcyHfjHLibP6MsEbuFS88xqAJGbiGnzqRqy0/0pj/4vBz2/My 7XWg7ZXViDy+OHLjpE0DqTm5EFZVHxPo4CIWjhOcsgRB3XJWZXjHsfL+Y0NuVU3oWox3 V4SyS0XVYvSFgwPvmIDGtE1E2r/Wt7adLxaA3pmg87W4hgiJnyRpRwTNvDo6wtr86jjM 6T/Ca4hj3pKklXkv8TrZswBD16mqfsREKb7t3QzPf3LY2b9WgddhhewM4EP2ofc7qOm7 MZALoVt5k73QZhnoB6wdNTmZpid41X8yh3RbkJZFAnHdi3AJUQgrBDGFenBOsNpAOv3Y BGMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719801621; x=1720406421; 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=zxGXeLDTWwJrQAuOo1mTnHZzykRZups2fU/jBOYflxw=; b=Fl0XOs2XL5EwWo0Oc4EMTYlXyJLtWsDKJqXdFiJahm0u+F0htsyURvajafXpvZbe3E MyApLCariYYmVj2TqXm/TeBd0jFiTuVRwTknLTFdJTcjGrj0Tf2RwsH5MO+C+br8aL6b 4VCpHlprPOoxz0AiTTCiAQeDOHCg5/tnw6h+5+R5QMubiZxKhsE8CGWbZn2/QF05y4U8 MtXsg5mgKP7ZZ/WATK7itVrAV3OLGHCxVmYkyVtxldqolXLYmt1JdyWHAOeITxp6pmpY sRFAtRIwwK8XTYGLqhY3tF7w0hE7DdJvDu3rr4cFwtnvr5PJ6A0fKda3my8xRGze3LAF P+ug== X-Gm-Message-State: AOJu0YxwHASscBQwDCAuiovK65cA4gEyu1wnDsgVV8L1sqFXFkm2gawc 8dZ2mVj2LGIUu0WfuPxOAHKyjd5I8NeVHbxfy4QXAKYmcrliCH0duMVvJw== X-Received: by 2002:a17:902:ec8b:b0:1f4:8bb9:924f with SMTP id d9443c01a7336-1fadb42d8d8mr75043155ad.1.1719801621115; Sun, 30 Jun 2024 19:40:21 -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.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 19:40:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jun 2024 23:40:22 -0300 Message-ID: <20240701024022.2898-4-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 4/4] avformat/mov: add more checks for infe atom size 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: voJ40OieJG4m Signed-off-by: James Almer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9f6752b492..ba33e52086 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8510,6 +8510,8 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom, int idx) version = avio_r8(pb); avio_rb24(pb); // flags. size -= 4; + if (size < 0) + return AVERROR_INVALIDDATA; if (version < 2) { avpriv_report_missing_feature(c->fc, "infe version < 2"); @@ -8521,6 +8523,8 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom, int idx) avio_rb16(pb); // item_protection_index item_type = avio_rl32(pb); size -= 8; + if (size < 1) + return AVERROR_INVALIDDATA; av_bprint_init(&item_name, 0, AV_BPRINT_SIZE_UNLIMITED); ret = ff_read_string_to_bprint_overwrite(pb, &item_name, size);