From patchwork Sun Jul 28 23:09:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14111 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 98396448115 for ; Mon, 29 Jul 2019 02:11:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73FEB6805E4; Mon, 29 Jul 2019 02:11:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9AF8680268 for ; Mon, 29 Jul 2019 02:11:00 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hrsJf-0006Or-2l for ffmpeg-devel@ffmpeg.org; Mon, 29 Jul 2019 01:10:59 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rsIhhHwWY5D5NrsIhh2cVX; Mon, 29 Jul 2019 01:09:59 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=UsJ_fnG_i7_G17t8Pe0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 29 Jul 2019 01:09:31 +0200 Message-Id: <20190728230931.23214-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190728230931.23214-1-michael@niedermayer.cc> References: <20190728230931.23214-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfJQEHLo7dXnBDxmXzKg4w9aFmqzPoldiVJfXvS9XvZZXaKgyyNXO9ICVyV6uYZPc3dnE3PN9XZooUooylxMsZxfAIvTlK/HPhKlICx28kn/+HTNIQcJk kw9LC04Lfvy+1FbK3Z1qKN8eGzz0mRhGeK//Wa0P56+tAZO8NkxB4fBf Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mpsubdec: Check pts / duration before cast X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: 3e+47 is outside the range of representable values of type 'int' Fixes: 16057/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5691111307214848 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mpsubdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c index 4ff49ba3cf..a8217a4a61 100644 --- a/libavformat/mpsubdec.c +++ b/libavformat/mpsubdec.c @@ -83,13 +83,20 @@ static int mpsub_read_header(AVFormatContext *s) ff_subtitles_read_chunk(s->pb, &buf); if (buf.len) { + double ts = current_pts + start*multiplier; sub = ff_subtitles_queue_insert(&mpsub->q, buf.str, buf.len, 0); if (!sub) { res = AVERROR(ENOMEM); goto end; } - sub->pts = (int64_t)(current_pts + start*multiplier); - sub->duration = (int)(duration * multiplier); + if (!isfinite(ts) || ts < INT64_MIN || ts > INT64_MAX) { + avpriv_request_sample(s, "Invalid ts\n"); + } else + sub->pts = (int64_t)ts; + if (!isfinite(duration) || duration * multiplier > INT_MAX || duration < 0) { + avpriv_request_sample(s, "Invalid duration\n"); + } else + sub->duration = (int)(duration * multiplier); current_pts += (start + duration) * multiplier; sub->pos = pos; }