From patchwork Sun Apr 25 19:40:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374131iob; Sun, 25 Apr 2021 12:41:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweA2sBL5sls9d8huwOPeqBg+87AkG06lqxbBzSo43T9Qm53wOV2hr87pS/DNd9xz4L07LJ X-Received: by 2002:a05:6402:1c84:: with SMTP id cy4mr16697403edb.260.1619379686134; Sun, 25 Apr 2021 12:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379686; cv=none; d=google.com; s=arc-20160816; b=fTMQiWLm6RN54ay6kOQ4h93gN12Z3mbUXNVPuIXylk52qAmQtrm5PZCfNRlACMj0g+ KN3DhaLaNFtiMZ+FRwMK4B8uOCMQlyqUxmtWdOQZjk4LGYT7NFPZ2mlEWUJVGJ8QHcAx X7IMzxENEU8haiH31WBpYv2kdHOONis5dkaHPzqCB52Wp9Wu9Y2w5xsevuchvqp7GcTb BC2x9vjGq1PB+LiWOE2lzBqBeqpC7HKPHg5GuRNNqFAUlgKP6aA204yaFAv6JNk8gdHA 9w3fOh/f1w+8HNvzcfWjUH6vzobUANidX2s+Nm+8zrwPdzhoc1H1iEwnFO0lMb92gNso KO+A== 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:message-id:date:to:from:delivered-to; bh=CIOALHPL/6+00Tl/T2QMR5rh1KA6eLkvZr3IHTyhrXw=; b=Nf+Q6ZdTmQI3JYWbylkWad2f8JIAD5TLI4sg4aQM7bECKyE4KGnY/Bq1d4L8FqTRsq bS/cRuYcdkOR33BwcxPMsEFSJMT7W6MSUnGQIZQwLgQIwoyKSYXKeGF0HJZXZl8/edSk o6MClNwIJkU72OsuXt9K7e9DQtFDBaj5pj79oYl4TYd+9g5nR+k2I+hMMrMJ3LYVzqEe fAkeeFHzDUWyz6ugtB+zXgmzvFl+xDQB7BzuKEFFGseB5mnE0qdAOA5MxfjuLCzr9ZTj +uKDxTc9RZS1e0Aqu22n2kS7DR8ynpiP1UgXzWPQeO+xOCofEKbeabXVpyEXH2ymjcIV oosg== 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 a1si11264454edr.67.2021.04.25.12.41.25; Sun, 25 Apr 2021 12:41:26 -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 9C21C688043; Sun, 25 Apr 2021 22:41:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F3566807DB for ; Sun, 25 Apr 2021 22:41:14 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lakd0-002HJI-0N for ffmpeg-devel@ffmpeg.org; Sun, 25 Apr 2021 21:41:14 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id akc2lFjaaljeHakc2lu0hm; Sun, 25 Apr 2021 21:40:14 +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.3 cv=BoHjPrf5 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=bVp0kgp9O8nky_G-ibQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:09 +0200 Message-Id: <20210425194014.957-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfHZX24EhB7x+R1vJQyabIr7eBWu9dw3XuKNwpt+RkQFvis0/vUB7s9NeUxjCqCv6mhYYrxg60DutEv6DdIfKJK2vBz1kR3kECjUAvWYsq9HB6qEv6odi jOafR21Yfnvp2Rcf6asRoj9HSENOfPNnGvkXpfkJ3OXi69g/JOoC/YaC Subject: [FFmpeg-devel] [PATCH 1/6] avformat/subtitles: Check pts difference before use 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: y405M7uPs5Lr Fixes: signed integer overflow: 0 - -9223372036854775808 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MPL2_fuzzer-6747053545881600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/subtitles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 05c07cd852..6368ec74f9 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -206,7 +206,7 @@ void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q) q->sort == SUB_SORT_TS_POS ? cmp_pkt_sub_ts_pos : cmp_pkt_sub_pos_ts); for (i = 0; i < q->nb_subs; i++) - if (q->subs[i]->duration < 0 && i < q->nb_subs - 1) + if (q->subs[i]->duration < 0 && i < q->nb_subs - 1 && q->subs[i + 1]->pts - (uint64_t)q->subs[i]->pts <= INT64_MAX) q->subs[i]->duration = q->subs[i + 1]->pts - q->subs[i]->pts; if (!q->keep_duplicates)