From patchwork Sat Jan 16 23:07:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 24982 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 A814F44AF71 for ; Sun, 17 Jan 2021 01:08:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9065C680728; Sun, 17 Jan 2021 01:08:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0EFC6802BA for ; Sun, 17 Jan 2021 01:08:30 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1l0ugI-0004UY-0N for ffmpeg-devel@ffmpeg.org; Sun, 17 Jan 2021 00:08:30 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0ufKlWPTwO4rA0ufKlnTJu; Sun, 17 Jan 2021 00:07:30 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=RNDN4Lq+ c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=THmRmSgU9ycrwHirP1QA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 17 Jan 2021 00:07:28 +0100 Message-Id: <20210116230729.30613-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210116230729.30613-1-michael@niedermayer.cc> References: <20210116230729.30613-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP3K89B6pxi6tTTg4ZhsemRz3u41y1xETpXDsQtRVPkWvy0frSs9R8Iav6mBpc/ewRFt9VKfp1nhIpkGV7E+DhN1rSvPvp8cGbEyVQIGP/kF+gmRofR4 XAN22wYUVWaXvufEk3sLRccTiW9NxJYUzZCZ1b803t6ON8E47eOVxlJf Subject: [FFmpeg-devel] [PATCH 6/7] avformat/realtextdec: Avoid undefined overflow in the end of read_ts() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: signed integer overflow: 234080282628234040 * 100 cannot be represented in type 'long long' Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_REALTEXT_fuzzer-6649867065753600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/realtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index 390f8ddc67..f534774420 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -54,7 +54,7 @@ static int64_t read_ts(const char *s) if (sscanf(s, "%u:%u.%u", &mm, &ss, &ms) == 3) return ( mm*60LL + ss) * 100LL + ms; if (sscanf(s, "%u:%u" , &mm, &ss ) == 2) return ( mm*60LL + ss) * 100LL; if (sscanf(s, "%u.%u", &ss, &ms) == 2) return ( ss) * 100LL + ms; - return strtol(s, NULL, 10) * 100LL; + return strtoll(s, NULL, 10) * 100ULL; } static int realtext_read_header(AVFormatContext *s)