From patchwork Sat Dec 16 12:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265675pzf; Sat, 16 Dec 2023 04:17:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMAU5aRrFD/SaSh8HR3r6tLd7lRUGEC2SqQByqGIt/vCCeNz2NpQWp7JZi8uJQdF3Y1YU5 X-Received: by 2002:a17:907:a090:b0:a1b:7f8a:7c97 with SMTP id hu16-20020a170907a09000b00a1b7f8a7c97mr5108039ejc.77.1702729021115; Sat, 16 Dec 2023 04:17:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702729021; cv=none; d=google.com; s=arc-20160816; b=I0W1d8C3lvLPRQrsL3LmO9oDA2LGj9KCNsyR8OpBMmFA4+plS+GKyVf2GNnsW7gmcQ IFMXFDJosHQgW8v4dN5Kt9bbAuESQYiqC00b4cHhIqdnP4R0QKOAQZ+YZv6ARHDTaWzp NJtTIt9cb4fNnt7pfX50A1M9v4bF8VFoXc15rABijMjMQAE067jFGWqkKGaNA6wlgHsy kMykdTHFv+Ra9wa66yBO3Hjg1XYp+Q1j7tfi7e/K4gD5oaniF1Zx9v2W6yExFTEHk9Bg Qy5jBlQZbhFH7VCzPs8+Y6EsXonl0aqz3tOoA9OSE4sMJ9942cN7fEWOBcSueliPcFRz 62tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=faBmnGx360U4JoYMmUTgVejtUFMaUL5un+TtJyaMRbU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=hBd7QQwy8SfrVNXeJ8ATGoPl6CE0quyMsIU2xJqOaivc/gAIvXHcuwJA/AzpWMomX3 GhC/+1WVH+/JMxBS7WJl9N1ubBnEDmBt0u6o1U7zezrCzBmRCPeytssUHZ0iLdFRBeSd tE+pfTuGNc/IgnlfcJd4IWvxbiKt17/bCvYt+0nUS1Mq4EKoimmvLjguR3nWET2SsXyr H7QiJDGLmsLQtLqFPhh/T8hgHbx2Cp+95Wk3J2tjk3WsGbJ+pLBBR/pP5mEgwbAMvvE9 Sq7+VjGAOx+bC2W34jybfZCLCnf1wviefr57Bz52tkK1+iv8esSt5h6vQYKYqKTq6U60 iGkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BiOt4tNr; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hy2-20020a1709068a6200b00a231bd77713si1228904ejc.580.2023.12.16.04.17.00; Sat, 16 Dec 2023 04:17:01 -0800 (PST) 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=@niedermayer.cc header.s=gm1 header.b=BiOt4tNr; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7344668D123; Sat, 16 Dec 2023 14:16:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A634468D08A for ; Sat, 16 Dec 2023 14:16:23 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id DEB9360008 for ; Sat, 16 Dec 2023 12:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=hqc0SoRe/ogCdZHwL3TZgQcx71ZKFOu64OJdPgbAW88=; b=BiOt4tNrQ54iXAD+ObhB/pVubvj2ZMwbPzh+5zXs0c2N/1WoM8mFCSODFz/gaT/kdxYtQW OnHpTtXNYKpASErc9PmgAoJpIKqwRih1otZhP+XTyciXkOiA2YXc/URzyGFaVW6mmJjhcs fyxJQkpoNrp3WGFrhQQDvq1+MgS72+JXgn9QwwkqVIxnoSn/5S6FXZiCg1JTja8Ye3mHOw zhiPYSU8AG8cuqLc+1B6L89QP5oIZPQlu7qUrNboZPGlo5MP6QFEAXqQCrgGGppxgFogA2 9iiwU0tfPba4dH/VSnmh6dAoK37zk1FNoxGEw82P3gjxZwerchudEWxGT68D/A== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:19 +0100 Message-Id: <20231216121619.19436-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231216121619.19436-1-michael@niedermayer.cc> References: <20231216121619.19436-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mov: do not set sign bit for chunk_offsets 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0VEz8roP4Xwk Fixes: signed integer overflow: 2314885530818453536 - -7412889664301817824 cannot be represented in type 'long' Fixes: 64296/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6304027146846208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 30cf7a15b01..65c5c8c288c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2242,8 +2242,13 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < entries && !pb->eof_reached; i++) sc->chunk_offsets[i] = avio_rb32(pb); else if (atom.type == MKTAG('c','o','6','4')) - for (i = 0; i < entries && !pb->eof_reached; i++) + for (i = 0; i < entries && !pb->eof_reached; i++) { sc->chunk_offsets[i] = avio_rb64(pb); + if (sc->chunk_offsets[i] < 0) { + av_log(c->fc, AV_LOG_WARNING, "Impossible chunk_offset\n"); + sc->chunk_offsets[i] = 0; + } + } else return AVERROR_INVALIDDATA;