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) From patchwork Sun Apr 25 19:40:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374228iob; Sun, 25 Apr 2021 12:41:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxikQM08Jr/MhsF5HQYZkFdxxk37PpW6iCB+Id8fH59phztScLZKMURcFEFvF4EGybyvXoi X-Received: by 2002:a17:906:5619:: with SMTP id f25mr14502486ejq.393.1619379696514; Sun, 25 Apr 2021 12:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379696; cv=none; d=google.com; s=arc-20160816; b=J72rBbbrHhDE1/U1Y8Tdu9ZutKWFAduvoAXP0jag6ffSWJBm8cXQT069J9ZkVw6Rn/ KzQyqVQKi8aPYVrQco5b1aWYDaljdmQfQ5bhiZhfdKbN+bwIJff73ORNjCVoctvwFW7O O+VSD1IQEteX4ehMkN138Yi2zpHOrklopdhvk6WYFiIfm2uoQk34gmsshzQZcbu1g1hx anVE+o9k0Bw+qlEPatEJLNrUlHasdKu7wmHu5WK9JcgtN071tSf750o4elQP3WLbRYEh rdzMVXIEe4xNEFEClTym4grZi6dqUozxBDaDXMIT1aJYbvCwn/m+1/FtC6kyQwVqdG0d NzOQ== 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=eKzTdmj2fF7RzwEhUDoalAiOCo5mUY/L88do+/jf+vQ=; b=0cRDxi2Je8qUsvRiZIUOmeAgJfxn041nKi7FsvpHYeYC28OrBzSwHDyBwm334zZSCI 0XILoRC7t/xu/CERrf6bQoBvLdmMG8Vt8mGlEQtC8WRGeq1SH5MRKphYApNJDzjH3D5a CAJdOc40XBB+OIs54FVhEsUFqfDy1So2RjtPf6w1nglaah2BsEm+/O5LkuaZbsqHgFEn xxf43Qk9W+3u1SBDk0UGdXy0CsXSbCIECEATnIy/B+NbDnpzUT9llqoDtxqCQQejTj3t l2x9GiV78xZBTDl9dQdITJzUkB9SIM3Mxb4J6ael6uM8bjvPUVYSlO6DkjUJvCKwitqk 7WTA== 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 m5si10854120ejn.599.2021.04.25.12.41.35; Sun, 25 Apr 2021 12:41:36 -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 D9E1E6808E4; Sun, 25 Apr 2021 22:41:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91FE4680CDE 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-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lakd0-007rya-0B 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 akc2lFjbTljeHakc2lu0hy; 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=Qw7tQhG-lC0x1BXttaEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:10 +0200 Message-Id: <20210425194014.957-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHZX24EhB7x+R1vJQyabIr7eBWu9dw3XuKNwpt+RkQFvis0/vUB7s9NeUxjCqCv6mhYYrxg60DutEv6DdIfKJK2vBz1kR3kECjUAvWYsq9HB6qEv6odi jOafR21Yfnvp2Rcf6asRoj9HSENOfPNnGvkXpfkJ3OXi69g/JOoC/YaC Subject: [FFmpeg-devel] [PATCH 2/6] avformat/msf: Check that channels doesnt overflow during extradata construction 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: qLXxwwLQRO/h Fixes: signed integer overflow: 2048 * 1122336 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MSF_fuzzer-6726959600107520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/msf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/msf.c b/libavformat/msf.c index 155f488e44..1eaed54357 100644 --- a/libavformat/msf.c +++ b/libavformat/msf.c @@ -70,6 +70,8 @@ static int msf_read_header(AVFormatContext *s) case 4: case 5: case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->channels; + if (st->codecpar->channels > UINT16_MAX / 2048) + return AVERROR_INVALIDDATA; ret = ff_alloc_extradata(st->codecpar, 14); if (ret < 0) return ret; From patchwork Sun Apr 25 19:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374298iob; Sun, 25 Apr 2021 12:41:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylEvoqd4jXCn58jtUm5Lyb/gA62j27vNrzNXZWOHDac9+tfIbwLjUsqRgD8B/8Vyq7/JyU X-Received: by 2002:a17:906:fb19:: with SMTP id lz25mr14548934ejb.544.1619379704106; Sun, 25 Apr 2021 12:41:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379704; cv=none; d=google.com; s=arc-20160816; b=sTTqbXwVvGl3fMq8wHB+RZlQLDi8NxqFi6GPihqlCUVFOnet3MgmLDTEjDKvKE1ajA xiNvlgvis8BN0X9Pq//7ZjteYq01YTvCi3BDL1hrJSe9MlgkZyEhUdZMipuk8oE6ZdBe 9quX9LNHITadP4fKDi2w7s9PRRnHaGJmV+lz9RSaHWx6oMTJC0ebMK32m9KAtXx+nEdg XIqmFzhS2ZzB7kw+bTebiK8IWJtKL1LhUHi6aGUobu8VbtqBcZBYG6weM1DJOUZxGxti REp6CBir88XDtmhFT8jEmV119JaZUCg46+JOGO1hsMGE9wArfmq4ZpdTywlz91wRS4cv IwCg== 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=yUhQu+m/wct9UTOxRFk+TVWPyR4vofV9ztqSIfA/8hg=; b=rSKWB2NnA3H4Ep4fzBXz8jSQ8OasItBpXljhaYEq26cxosY4Eq976stbGYECnK2Go5 3klbfR2uzQX0qrw2ByLPxn6B0OzNJ/JZuSmzsVCWrhMCdFJMKxbqRuS14WLV/jkLBBgi 9QVZN+N0WPNW1zuu3mRpbIxQi9sT7+u582rCcWTpTs6hfsl3CiICWckdHkJg1lt8RaPu peqEpmRK8ePxJMHGCjDsrobpp9HDefgLZZC+pxLTlS4ew8YTCNFR/mF5CVB0laER8mzm 0cL8M0XSxW1I5t1BySbRkBs6zTsNQAwhTFlKpsqcuRDGIcSY9urmvRyVAIkvLCClqSxV M4Pg== 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 f14si10827278edv.139.2021.04.25.12.41.43; Sun, 25 Apr 2021 12:41:44 -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 2F336687F13; Sun, 25 Apr 2021 22:41:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95252680CF3 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-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lakd0-004pld-0B 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 akc2lFjbkljeHakc2lu0i3; 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=0QhkZZkUCceMK3EVKVcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:11 +0200 Message-Id: <20210425194014.957-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHZX24EhB7x+R1vJQyabIr7eBWu9dw3XuKNwpt+RkQFvis0/vUB7s9NeUxjCqCv6mhYYrxg60DutEv6DdIfKJK2vBz1kR3kECjUAvWYsq9HB6qEv6odi jOafR21Yfnvp2Rcf6asRoj9HSENOfPNnGvkXpfkJ3OXi69g/JOoC/YaC Subject: [FFmpeg-devel] [PATCH 3/6] avformat/nutdec: Check tmp_size 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: oZ15T3NzEfRM Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_NUT_fuzzer-6739990530883584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/nutdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index d1f3496990..4dd26c50ff 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -286,6 +286,11 @@ static int decode_main_header(NUTContext *nut) ret = AVERROR_INVALIDDATA; goto fail; } + if (tmp_size < 0 || tmp_size > INT_MAX - count) { + av_log(s, AV_LOG_ERROR, "illegal size\n"); + ret = AVERROR_INVALIDDATA; + goto fail; + } for (j = 0; j < count; j++, i++) { if (i == 'N') { From patchwork Sun Apr 25 19:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374465iob; Sun, 25 Apr 2021 12:42:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyieXHy9DOMi/APX+ALN2tFc2Sz1L8jogD352OlsiFpSLHJfTUAUuCUzrJOUyrHr7pyO9e1 X-Received: by 2002:a17:906:e5a:: with SMTP id q26mr14880589eji.263.1619379721108; Sun, 25 Apr 2021 12:42:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379721; cv=none; d=google.com; s=arc-20160816; b=I/rlmyWlf8CBeF88Zb2c42mlsZnNpzcpN1FnPSM9ZrQGcwqr7Y0bkSw4jwZqyKdO30 qXqK5CUgnxD43cCY9t+yGScsDRmFmmI0z0bpX2Kqc+diWxAFEdKL/C/N6bv4e1gJk8IY SfQCilxaKgS57F/aQ8EhoaMLOC+aQp8rvX7XO29Py6uwUH16jUm2fK5jKoe3dnMnZRJW uRch4UzcFkVmZcS3XQ71kPwdvlmjRXdSg1zkdhEwFDKQDyWp9ySMdAioPYCTDsFeQGdw Jvph8tcczzpgg6IXnytbzNDP/5k9XbAK9fBRhuIALW9JhTlR03uVArrJY8zG0jyq7mTP 2Y4g== 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=MZKhNlP0y1j4CKPd7oNZaJ1iN9zknKsIjW6MWd/zaLg=; b=GmXkyw2dMhUXEuGhDmacyBNa7R2x3SEc0KdWNZMQfLnegUPjdptLc6YHJb9767LlPw 9b55+3PDGDYRb4HwF3DssWvwPNxhWXWVyseb/52GedOltgOlmmXc2o+kIdB+tsn8bFek ExXqziipAgIHYgPiMzbWSVWl6HmHahjsyWQNYoF9HngODTC5bzTZQGmCLhdJ3nUx4UXA 25xODsGvIWV7SAw+98bA9Sc52wWszG6jrMTihSaYolW5YKQNOm9GB0krtHClxQ50nseO 9soLRfqQygdjwMZPxZsC7EGCViJY+/tzHAbdpoEYaKqWgqntJCwK/HJdoGO5YFYVjyQp izuA== 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 w11si13716659ede.2.2021.04.25.12.42.00; Sun, 25 Apr 2021 12:42:01 -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 C97EB6880AA; Sun, 25 Apr 2021 22:41:25 +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 37F6E680CF3 for ; Sun, 25 Apr 2021 22:41:15 +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 1lakd1-002HIz-0W for ffmpeg-devel@ffmpeg.org; Sun, 25 Apr 2021 21:41:15 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id akc2lFjbsljeHakc2lu0i7; Sun, 25 Apr 2021 21:40:15 +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=G7kvjcKFJ5J3mClwFLwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:12 +0200 Message-Id: <20210425194014.957-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfI1yxvtNz1tA485sq5Ym0PuKZ2ezBhjsnqFlPrV0M78Qf1UR21/vo2fIF3r7trKSgM4ngKtp7E3NGoXFtDbyr1i+vQ7CMkswNX20kPnWenN1jWiBn37Q wwkYwBCJMcOmYiV6544YluTdwryJbQBZZskP4p/oi1jhVg8TTdKAPrbs Subject: [FFmpeg-devel] [PATCH 4/6] avformat/pp_bnk: Use 64bit in bitrate computation 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: RoML8SA/G0Oa Fixes: signed integer overflow: 1207959552 * 4 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_PP_BNK_fuzzer-6747301169201152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/pp_bnk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c index 07eeca3cd5..5ffe733b18 100644 --- a/libavformat/pp_bnk.c +++ b/libavformat/pp_bnk.c @@ -223,7 +223,7 @@ static int pp_bnk_read_header(AVFormatContext *s) par->bits_per_coded_sample = 4; par->bits_per_raw_sample = 16; par->block_align = 1; - par->bit_rate = par->sample_rate * par->bits_per_coded_sample * par->channels; + par->bit_rate = par->sample_rate * (int64_t)par->bits_per_coded_sample * par->channels; avpriv_set_pts_info(st, 64, 1, par->sample_rate); st->start_time = 0; From patchwork Sun Apr 25 19:40:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374380iob; Sun, 25 Apr 2021 12:41:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn5I1GKQTfGb/pi/sWn+gsdeH+v9is+9qBJipWaZM3gX37rNk8pI9NGkXw6hY7jZCKTny4 X-Received: by 2002:a05:6402:1a2f:: with SMTP id be15mr9856639edb.207.1619379712461; Sun, 25 Apr 2021 12:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379712; cv=none; d=google.com; s=arc-20160816; b=SKdiPyqzvsScxqhMZV3ANobAb/+hwCC+v1ekd7MukAS4xHkwFG6KLTVIDl/eoshqGo xuPrcJwfChw+tToClVWm6pFt+Tn8s4XOiUj8BJtKhk+x7TFZP7UFeT2jR4QPZiG6P7DZ 7u0CUaEnoN/tdYdsdTUjQIDgzTvY0NGMrCm57NCSP9+EXOGo3qSr7Odrrra/1n4qxzPG Fn8oWN89so+SAWcbES/maGuDigGUBSiNZsKIh23SuzUtgoPkdshsXTLzDQoeXLHLj/4G +qQIsx/vqYwoGR+UcxsBErB2sFEn9owBkY9SPkF22pHYXcpIWR2py07w7PDLaDJseVaW 4hoQ== 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=E7VTfUh+o66vfy8hcAitv4OUdyyVqecyMIX81ESdsS0=; b=vwe1hkkCq1QKl9jZlgt4VnAzbqYmlpWhJyct1FtRs6IuTxbEpeOzg+NIAmtZZHR+7H 0IaVleEu1Xv++AyJjMT5Xxj1UNvdi0/mhQzAr0WOohMUe7TThkfxgCDY857tEftSzmTb toBb+Z6Z7CuuyyUJrxZ4KouT2ktVVKkErAzgSpUoec2WQv/e4t7bxax8vX0p+C0kh1UT 2O8xxo0uk0s/ZjaEeQhuI/6bcWLgTSVZ5N23BBvaVAlTxNS4zVC/yEJGMFcuETUlDvGr MWi97baxUYZu7a8j2yyTaD8mE21clXr+3NL42eMWdEQvVz859ybkIU76gaqspWi1Zs/g Z87A== 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 s21si11436366ejm.689.2021.04.25.12.41.51; Sun, 25 Apr 2021 12:41:52 -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 19243688081; Sun, 25 Apr 2021 22:41:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326DA680CDE for ; Sun, 25 Apr 2021 22:41:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lakd1-007rjs-0K for ffmpeg-devel@ffmpeg.org; Sun, 25 Apr 2021 21:41:15 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id akc3lFjc5ljeHakc3lu0iE; Sun, 25 Apr 2021 21:40:15 +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=P03E6L4JOTLWywOfdN0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:13 +0200 Message-Id: <20210425194014.957-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfI1yxvtNz1tA485sq5Ym0PuKZ2ezBhjsnqFlPrV0M78Qf1UR21/vo2fIF3r7trKSgM4ngKtp7E3NGoXFtDbyr1i+vQ7CMkswNX20kPnWenN1jWiBn37Q wwkYwBCJMcOmYiV6544YluTdwryJbQBZZskP4p/oi1jhVg8TTdKAPrbs Subject: [FFmpeg-devel] [PATCH 5/6] avformat/qcp: Avoid negative nb_rates 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: l3k+T7CW1RyL Fixes: signed integer overflow: 2 * -1725947872 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_QCP_fuzzer-6726807632084992 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/qcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/qcp.c b/libavformat/qcp.c index 168030dc16..4478875f2d 100644 --- a/libavformat/qcp.c +++ b/libavformat/qcp.c @@ -93,7 +93,8 @@ static int qcp_read_header(AVFormatContext *s) QCPContext *c = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); uint8_t buf[16]; - int i, nb_rates; + int i; + unsigned nb_rates; if (!st) return AVERROR(ENOMEM); From patchwork Sun Apr 25 19:40:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374565iob; Sun, 25 Apr 2021 12:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhwkvGY/MZKW2HRTAIoZran5DEDtQ32cPK3CwndzreG5cqBlgeKeCyaqm5eoznzApl6MSd X-Received: by 2002:a17:906:8a59:: with SMTP id gx25mr4456187ejc.63.1619379730343; Sun, 25 Apr 2021 12:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379730; cv=none; d=google.com; s=arc-20160816; b=0RLgnQCJPqGmvOUuOwBIbQRLMZcW8ULoLFmpxHZkeg5cdWC5KapzB8VBSD7abShtsV Gp5FKGtuxfCfWsrlzigHXO51jlGBER8w3n3Xq04wPxFWpw2QHhfFsSUUM6ZP5o1JH/ic xX0IH4YJxtWic/9IvFbZVp63abPso+rdLV+MW/ZUTiPi4lJVdKio0J2VBft5PELBpDx3 d/gRh2t2tVHRMUtYsTZiq50goY0LJJCiHRCF3mb/sTheVnKmlZIY4znMKOdy9XIVrVoC YfEYcND76hPL0+60XULKx8X96NN5c+RiR8UVy9c6cIAbCBAGccjzBRfcqa7b5asEeXMR vi8w== 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=U3ae8o3SX0eAnflRrGAeYUhK26XUJojZjBhmKpivoqg=; b=HyztDj6iS74mVvC/fY/i2+cEXQlSGrodF9K9at0ZdR6hly7+ztppefibjupUga08zu bS/SGTGDa11MX4Sg978fz9rkkq2OMSJtKgvuspXU4yye3v5rFigj98dD2Fpj+QCpZ+Wn nYSOuIB3NOJUmpUv5BGaFl2LncZTnJWZdcbftgimcdIn9RsGqAOH+z8lOz3v4I7wYTVn ccI/uDPavGbPsh7iqrZ0efiVcyD5Rf40o9FCwvORJJJD0fiq0L6dQvzuMl6npL3/ohfc Jv+EhudKsUSERhB8VNheZLs9AZagGlwZmKVudY3dB7QbRbHnjmbQZ+A+0toeuIMnq9sT UH9A== 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 dd3si10578835edb.391.2021.04.25.12.42.09; Sun, 25 Apr 2021 12:42:10 -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 228196880FC; Sun, 25 Apr 2021 22:41:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C413687F49 for ; Sun, 25 Apr 2021 22:41:15 +0300 (EEST) 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 1lakd1-009wWD-0J for ffmpeg-devel@ffmpeg.org; Sun, 25 Apr 2021 21:41:15 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id akc3lFjcLljeHakc3lu0iJ; Sun, 25 Apr 2021 21:40:15 +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=kHjn2dZU96DIAgcTv8QA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:14 +0200 Message-Id: <20210425194014.957-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfI1yxvtNz1tA485sq5Ym0PuKZ2ezBhjsnqFlPrV0M78Qf1UR21/vo2fIF3r7trKSgM4ngKtp7E3NGoXFtDbyr1i+vQ7CMkswNX20kPnWenN1jWiBn37Q wwkYwBCJMcOmYiV6544YluTdwryJbQBZZskP4p/oi1jhVg8TTdKAPrbs Subject: [FFmpeg-devel] [PATCH 6/6] avformat/realtextdec: Check the pts difference before using it for the duration computation 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: dYsM715lUbuO Fixes: signed integer overflow: 5404200000 - -9223372031709351616 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_REALTEXT_fuzzer-6737340551790592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/realtextdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index f534774420..368a741240 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -111,10 +111,11 @@ static int realtext_read_header(AVFormatContext *s) if (!merge) { const char *begin = ff_smil_get_attr_ptr(buf.str, "begin"); const char *end = ff_smil_get_attr_ptr(buf.str, "end"); + int64_t endi = end ? read_ts(end) : 0; sub->pos = pos; sub->pts = begin ? read_ts(begin) : 0; - sub->duration = end ? (read_ts(end) - sub->pts) : duration; + sub->duration = (end && endi > sub->pts && endi - (uint64_t)sub->pts <= INT64_MAX) ? endi - sub->pts : duration; } } av_bprint_clear(&buf);