From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0A2A742B57 for ; Tue, 26 Apr 2022 08:20:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F78568B2EE; Tue, 26 Apr 2022 11:20:42 +0300 (EEST) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AFB768B27B for ; Tue, 26 Apr 2022 11:20:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1650961229; bh=suljzgI1PGbT8sdPpMhgscSMKEf1/vTgzFQgny6bD+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aX+mv9jjWjnAjG7kVKsXQZEmZTUABWqG6IuAhmQQNQuMNshovLBY0SgQKNaV1q8fi iQphyjjCFFhh8uoCttOQ9tWMvcpq77yqxnz94s8kdF66WyNhpp5geTBn56CQsh5XNx 3terl+HmPQTWuXUrHB/CqQmh3WWPNtP+9c6AYkNQ= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.52]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 51A3A6B5; Tue, 26 Apr 2022 16:20:26 +0800 X-QQ-mid: xmsmtpt1650961228tp4154fj3 Message-ID: X-QQ-XMAILINFO: NLNuKjcZ2ePXs1S877sNlpGxNy6KsfWXIxZnO3cjTAtmVcl4xYFELpBDP7TywW ZoY4vC5hqpRXSai2tgMsCF86YaiScm27p0u2XRXx1ncZ9nNcRK7cYJ8Cown79AEM5HOeB6dCv6Xq rX/YvD1+upLpRqoUexk54ZuI60km0rU4WcllOwkuNqShjlXAVleT1MG6Y83sCLB7xZXxXBRq/UZT zdvW0+Ke3380KaiHAZI1zxDjI5FFxNENQUxyWz2IdpNa0D05niNf1RamijVmhUdGkO7WE5Z2t0lu 27lXv2AaY2Ns5xPN5UCjGpOWGGLfSl3Gu8hgChNiGaXdFeBKSJIhTryd5tkS//wUUq9a2DHm3f14 m3AjG7S3eTeLoZUxWNMjQOE2hb2l0FModfxkxg3I+L5CvTa3aYi320XDnyYV5cE5QGQBuXjPxYVO 8gmR+P1EzYC0Br1ZcjgGEyQ0LZUb8IBmtgDm7l7PhJo165rgl/Jbz5lPD8G+//7C0LWPATkCwRFl cloWHEu0ZEiP6vpDtjxxWZ20vfeAeJ7Qa2q6ARP6h7XSjiMdRGhEMGB7eHJsBz7LY1hZ/boVwkRF 6Ez+jRTBxIbgs7AWCuXIkniPeLKrFqdOeBcN7URDUWIcw1/2PTUEcFQm/n2Nc+C+8dAAmXWsBwbn +8wab3vD7HTxlrYZvUwg1pW5bS99tphod6zytLM+s0z1LJ7ySuKCp+5ejklx+rhpCTE6Uj686BjA hZtYatUv1IepK/S6OG2qaeP9EFD001RzWU+cJ7ndJKTSqx6oy9iqSFChaSeMnSaxub7LnUa2zkxH 8HcTlXLtKVfeRbcl97LliDlyliiazf32IxAy+tbNs1NlOz8YeQjiku5RKsLLxDRPXGHUE9sVPBNi qSp8tKbiSmv1Ur8POM3u18681qfefIbSP6Z1K7Dx8+vREU0LG8Udvjc15ZlbExgyoQS3S3XMVkXi xrwn585sU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Apr 2022 16:20:26 +0800 X-OQ-MSGID: <20220426082026.85353-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220426082026.85353-1-quinkblack@foxmail.com> References: <20220426082026.85353-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: fix use invalid box size/type due to eof 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e948c6cd0f..429f9fcbf7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7691,10 +7691,12 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size < 0) atom.size = INT64_MAX; - while (total_size <= atom.size - 8 && !avio_feof(pb)) { + while (total_size <= atom.size - 8) { int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; a.size = avio_rb32(pb); a.type = avio_rl32(pb); + if (avio_feof(pb)) + break; if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || a.type == MKTAG('h','o','o','v')) && a.size >= 8 && -- 2.35.3 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".