From patchwork Sun Sep 18 17:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38007 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp790734pzh; Sun, 18 Sep 2022 10:14:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6fp2QHN/+GLEFxx+2cff3gi/dKW10elGBZg7qyl6Nl/jnftY+M3CUt1UcUE7vlryRwxxYT X-Received: by 2002:a17:906:9b8a:b0:780:da07:9df5 with SMTP id dd10-20020a1709069b8a00b00780da079df5mr5934277ejc.273.1663521273811; Sun, 18 Sep 2022 10:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663521273; cv=none; d=google.com; s=arc-20160816; b=rUJPu1UpVRD020A1PkSAU085zlMb/5nq97ZOo7V2kgT0DShHq2ebnW3Rby9JD9klyF N6AbQhfArvUqKrs+HnUDI8GQ3QNUICg+NvtjiF5OFfsozuOopoiqYI/fAP+sxFU3M6fz 8MQkp93j6BfrgzDFfY+GLeYvxQ0wglTf+31Q8cd24fc+/I1UekYFuGnXOdrd1ttqqSUV Ey6QisqpV/Z5KkQTEPtwBFcNEiovf1EwiOKxhkQcOGPWzqgKBSVMENvxqfZVDCl/2Jcx /FIYPLASP3VjVDmy+Dsr48OZSIqmvQ3Hj5QDE4y26Y+mDy+gdLNWWziGs41yShF3HV82 w25A== 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:delivered-to; bh=nkfuUQm019RyTf+5X1mCKDnBbKUgJ9mgYIF4/NGZxS4=; b=mNWWA1DHgVvjSAu+5WuSELSc6ue9sP9mah+3EL9BKuOizJqFZG0jqmyqQvip46UrHU nOXiY+8YywliPAp38i6guA1epjdF8gDWmAXqOVVQ9/iXSR8ZQ6lHtJSPrMIPscAwOcGx wnYGgxVaF4swpWgY6pgZlOgbattlbUuJ7MRnu0HcSFm5m8XQVXyz9J007+FYhjk4+bJo oBAI51JWh/FVEK4LxZKYW4zMXyLj3QSeaqxCpn3BhQfWQQcC1dcgyERBqafQeA6bxMDW LOkASt0DNgOYDddpeLyM3RLdC96gUS53JUDX9k9NprHaMcwsxNexmXAvGacnt6VIbQ97 Rk7A== ARC-Authentication-Results: i=1; mx.google.com; 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 gn24-20020a1709070d1800b0077b36470c3csi21440369ejc.74.2022.09.18.10.14.33; Sun, 18 Sep 2022 10:14:33 -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; 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 8805268BB8D; Sun, 18 Sep 2022 20:14:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18FAE68BB0F for ; Sun, 18 Sep 2022 20:14:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZxrw-00EpEO-5h for ffmpeg-devel@ffmpeg.org; Sun, 18 Sep 2022 19:14:12 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Zxrtom0008s8UZxrwoH672; Sun, 18 Sep 2022 19:14:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id ZxrwoprDHOG5ZZxrwonHia; Sun, 18 Sep 2022 19:14:12 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KJo5sHJo c=1 sm=1 tr=0 ts=632751e4 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=as6ddgOmgsC_ngIvM0YA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Sep 2022 19:14:02 +0200 Message-Id: <20220918171410.31835-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220918171410.31835-1-michael@niedermayer.cc> References: <20220918171410.31835-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF2HMG47EhbXeicF2ElTeURRlJxsumEeX1rHC4CqCix3UrXTjhBVuorQGqC7Mx1oZFuD4pTXVI/6i+hEa29qK8iizAJjwJ0YB5Q/KB1pkBImB11Mo8Cc SGDNy8FESyJmA05wmEOm45ZQr8dZkF/LiCaUY/iM4n1gdFEC7bU4+FBgZ4xe2J6SxmSS8bEF5zjvKw== Subject: [FFmpeg-devel] [PATCH 05/13] avformat/sbgdec: clamp end_ts 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: rGTQrS01bl9U Fixes: signed integer overflow: 9223372036851135042 + 15666854 cannot be represented in type 'long' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-6573717339111424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/sbgdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 8a6d6790566..4cd12347e7b 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -1478,7 +1478,7 @@ static int sbg_read_packet(AVFormatContext *avf, AVPacket *packet) int ret; ts = ffstream(avf->streams[0])->cur_dts; - end_ts = ts + avf->streams[0]->codecpar->frame_size; + end_ts = av_sat_add64(ts, avf->streams[0]->codecpar->frame_size); if (avf->streams[0]->duration != AV_NOPTS_VALUE) end_ts = FFMIN(avf->streams[0]->start_time + avf->streams[0]->duration, end_ts);