From patchwork Wed Sep 15 20:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598958iov; Wed, 15 Sep 2021 13:02:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJww6ZQTCUxbXVgbGN0lLFJ78T1UjKWleEibGhlUCMk4t/Apo/88NZrL4nzl1JTdy8HBtzNC X-Received: by 2002:a5d:59a6:: with SMTP id p6mr2000243wrr.142.1631736162842; Wed, 15 Sep 2021 13:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736162; cv=none; d=google.com; s=arc-20160816; b=Eb12GnMK7aWDyP2Q4KH5pcH2W+o1+0hddJIJL5H0O+/zNEG5PKIFJjVjT5KXcjug2Q fOBlsGy5asZNqDWkH0bBLKWF2orslDAT8r1ajV5aAotkctOZhVHK8SQVtRQwTXe/r07H yCYh5U6MyP2EqRW9r/dbR6p7F4H01OmH/uh28R1A7131juKh7yZ4WZq8KtRv0MxPl0uT i+obum7K5KMaEnDIPJgJ21I96YnhL0taIlwPhnXEQUTpF3Qz6k+6wtXWh5BuIb0MGz5N XoFhkBVq/fNgU0qN8jW20QDROgn/gOSI4sImUdtu/xDR2Sr7cz7R8wUJHuVl0MJeB0zb te3w== 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=EuAy6HAwVRHBmGDGm45fkT0yrm7eYBWjWT60yjm6Yns=; b=ABe6iZUA7X8/fdCFXRGnWpYANalNwXL9fGSYVg5NuQKFmse8VRwFXub1lI4CAxjBod CGmopaKGhjjyLjrINWDOipXB6q2mU0EkPLQg9VowWrMdJZ3ct99OuB2zNoZ1Mef93D72 WiPJYG5Hi4RtaS4AGC8qEd8DQFdWob4OiMxfu6TKScGYRKgtYd7bBoG64BSVHMr1crz8 Pd683Vn0jTnt/5ZxBxf3SyYccDiSdsotOSWtOhpRPabpbbWArNBGhyyzUIM56YrpZNXp MyWo0Y49y9T6ogf/7KR38wIh38ogJXhry7e5UMV/50otcNJJG+rsDgyc3GX1xWhbQgpI tpoQ== 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 eo22si951710ejc.690.2021.09.15.13.02.41; Wed, 15 Sep 2021 13:02:42 -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 DD3BE68B01B; Wed, 15 Sep 2021 23:01:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00E9568AFEE for ; Wed, 15 Sep 2021 23:01:49 +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 1mQb6L-008BdN-0J for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5MmAUV9ljeHQb5MmYO5J; Wed, 15 Sep 2021 22:00:49 +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=_SdjEQbTZMwXMvWYGdEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:44 +0200 Message-Id: <20210915200048.6691-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/sbgdec: Check for t0 overflow in expand_tseq() 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: 3s/j15myhVCn Fixes: signed integer overflow: 4611686025627387904 + 4611686025627387904 cannot be represented in type 'long' Fixes: 35489/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-4862678601433088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/sbgdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 50e10f25f69..5821ce967a0 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -965,6 +965,9 @@ static int expand_tseq(void *log, struct sbg_script *s, int *nb_ev_max, tseq->name_len, tseq->name); return AVERROR(EINVAL); } + if (t0 + (uint64_t)tseq->ts.t != av_sat_add64(t0, tseq->ts.t)) + return AVERROR(EINVAL); + t0 += tseq->ts.t; for (i = 0; i < s->nb_def; i++) { if (s->def[i].name_len == tseq->name_len && From patchwork Wed Sep 15 20:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30267 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598848iov; Wed, 15 Sep 2021 13:02:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyG0wNGDGjFAqKfBTabjI8JrJO4Pw7TsTcEFqBJFdQrLImpaTAAL3NTboRM5mWSkmfONr1D X-Received: by 2002:a17:906:a24d:: with SMTP id bi13mr1901571ejb.481.1631736154268; Wed, 15 Sep 2021 13:02:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736154; cv=none; d=google.com; s=arc-20160816; b=GwcCk0Ysl0JVmZ5CV2N4+199qIaSbKo9llZQLcOYZcnY124seAcSN4J00BREo/r5IB yLOasdu4J0GbjHl1IOUaipk1Iyj7oNzZyGBoqxEq7FnBml1zBBQD8irN+BsT1PcrgAUt ulBmxmb006uLJFUAsfUotlDORAd1TeDyflbdZjqPOl8mGuJXXm+KzDMMVfi/NbhOGbOK t3QD1lBMA+m542Zx2xY9jASO4kcl26jYtkTW776ecEvzpi2nuHLDPoZ0nal1sGPx2cGu SXkpofttIpEShMGHy8+y/k+zujM4QF7z5RihXFNmZNaO5eKoOVZTtw55FSDM5K4t6dMZ WtaQ== 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=LfQQK2ygfKDy7dQdCytJ34j6GBFK6t3AhbnAnWo+JmY=; b=h2dxrKb/iogV8JKm7JPI9h5yqy8VJTpMJa0knwy9jy9Xv+eCJWPUIXzasmjRjGn+rX a5mDUjgyVqEo7tLBTePrA1yYzYqw66wvfUBVHx+P0IY8D6eMIjkLPxUQQPaXrKTiCy34 Gi0iOH51qaEiZmLjLM+q0mUiYpyL2U63WqOKElqrI3Z0Dr2BRuEUqRBdUljQqqZgTZVx CWxXIj5HC5wN8zKTAg8OOt1upmCD30V1Wng/nwK1lM0bYxHhXLPNP4/aTuLjdjUJtfQ3 xSb0Bw1jXOlfTMdF1kzF4NFeLFzE4Z9KtpaLOqXo+WmJQTqG4gU+RsleSG+VLAoB3UyN fnDQ== 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 y12si947209edd.393.2021.09.15.13.02.30; Wed, 15 Sep 2021 13:02:34 -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 F32A968B015; Wed, 15 Sep 2021 23:01:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F410868AFEC for ; Wed, 15 Sep 2021 23:01:49 +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 1mQb6L-004OHo-0I for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5NmAUWJljeHQb5NmYO5t; Wed, 15 Sep 2021 22:00:49 +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=EfaNEuAiC44ZH2k_WtwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:45 +0200 Message-Id: <20210915200048.6691-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915200048.6691-1-michael@niedermayer.cc> References: <20210915200048.6691-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 2/5] tools/target_dec_fuzzer: Adjust threshold for WMV2 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: tbK6XGgG4naO Fixes: Timeout Fixes: 37737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-4923012999151616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index d192f7db488..f1844b368d0 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -210,6 +210,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_VP9: maxpixels /= 4096; break; case AV_CODEC_ID_WAVPACK: maxsamples /= 1024; break; case AV_CODEC_ID_WMV3IMAGE: maxpixels /= 8192; break; + case AV_CODEC_ID_WMV2: maxpixels /= 1024; break; case AV_CODEC_ID_WMV3: maxpixels /= 1024; break; case AV_CODEC_ID_WS_VQA: maxpixels /= 16384; break; case AV_CODEC_ID_WMALOSSLESS: maxsamples /= 1024; break; From patchwork Wed Sep 15 20:00:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30265 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598516iov; Wed, 15 Sep 2021 13:02:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyJz91AQVXKy+lIHu1ZedzYzeXb0tCSKguw0hzNpp4G48dBr2TRNmQDrRIn9xTbIj/GcFQ X-Received: by 2002:adf:c7d1:: with SMTP id y17mr1955878wrg.214.1631736131096; Wed, 15 Sep 2021 13:02:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736131; cv=none; d=google.com; s=arc-20160816; b=UkUkJ01mNX0pqa21iKJed0K815yyp7pBH/QHmswOVAZ7OioYEaGTt2XNxsNthTkuZx UZBbpJwrpunR1NaCm3Uqxuz0kV60gqBBJCGnIzwYsQsXuHngXCMMRO/05HBTql/Kj4Bz LhWnhm5DAMVkXP65LGJAjnCoiyq3HCnYr+onj5/y6iEgwHD0Hh7lCuIOJpgxd8mWDURy 2JDx1PFk45S/YKdWL69f/fOFkWDhtX/YZqI+lCo5+z6QGzLa6cgaNdTN74c5BLbyIXsn 2+1Hop5VZQj8nrnJP4BG5h6j7oAkzO8d4xsKNWWijNQJTB4uHu+gSr74Luvou7vwP6+k JsHg== 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=CfeuQOZF/KNBTgzRCBp3xZjVzYV830X049ocSNFLmpc=; b=tQCmS0t+HBplv7vzsflipN6KOzPbTVpMR5+dwvJXkU01yhP4jr7rN7gMS8Rm7imD4v 5MQU50txwM0BCxXTv7bXLa1kxSbzo1ICrTascJ23fb6Rht9kNTX0mlC5sbg2DIQEtgSM AhUEpdxktKmXNgY2tiZiH1kP6DDZ6spfhVCGlHmOeQyKU6dPPmx8gJV+ysNtc4Haby10 a2BFCW84bHh86XqLjHAPp140jv4DkqQDagPDJ1/c5lqMv6wbLsWZv6fbLzQiDhMHLN9H 39Nt2gBDJZjxES3NTe3KL/ca4i2ODKDl6o1cRihhXO63N+d57kyFZDNFDn57uzSx+qbV blrQ== 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 c102si1010996edf.195.2021.09.15.13.02.10; Wed, 15 Sep 2021 13:02:11 -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 0ED8768AFEC; Wed, 15 Sep 2021 23:01:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2F6368AFBA for ; Wed, 15 Sep 2021 23:01:49 +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 1mQb6L-004OHq-0I for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5NmAUWVljeHQb5NmYO66; Wed, 15 Sep 2021 22:00:49 +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=1CTyiEAt8j71vDr9E5QA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:46 +0200 Message-Id: <20210915200048.6691-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915200048.6691-1-michael@niedermayer.cc> References: <20210915200048.6691-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mvdec: Do not set invalid sample rate 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: dErWnobRo8z2 Fixes: signed integer overflow: -682581959642593728 * 16 cannot be represented in type 'long' Fixes: 37883/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5311691517198336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mvdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index b1450e08da9..7573087c7cc 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -156,9 +156,10 @@ static int parse_audio_var(AVFormatContext *avctx, AVStream *st, } else if (!strcmp(name, "NUM_CHANNELS")) { return set_channels(avctx, st, var_read_int(pb, size)); } else if (!strcmp(name, "SAMPLE_RATE")) { - st->codecpar->sample_rate = var_read_int(pb, size); - if (st->codecpar->sample_rate <= 0) + int sample_rate = var_read_int(pb, size); + if (sample_rate <= 0) return AVERROR_INVALIDDATA; + st->codecpar->sample_rate = sample_rate; avpriv_set_pts_info(st, 33, 1, st->codecpar->sample_rate); } else if (!strcmp(name, "SAMPLE_WIDTH")) { uint64_t bpc = var_read_int(pb, size) * (uint64_t)8; From patchwork Wed Sep 15 20:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598704iov; Wed, 15 Sep 2021 13:02:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyK7b3lSeic6vnn/9kvCEejPv8DDJK7x3cjR/jQ19lrT8Kr9HSjRklV0YT8hZL0q9PZlcku X-Received: by 2002:a17:906:3845:: with SMTP id w5mr1924616ejc.22.1631736142653; Wed, 15 Sep 2021 13:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736142; cv=none; d=google.com; s=arc-20160816; b=jpQMsqd6GO72O3WixXN1RacJ+YvgKWQpG4wJooapBwMz/XwPIoRTuxJ6lxKuvS25/U iM/wSNeAzQ+tCRgcn8AJJhuyjBMJgTsbo1H3HU6GJKmfghlDJR3PFz8IvcCzwAsHnIcx wxUzTLHRrGqMAUnNMCgVy+TGmj9anLyq2D/qY/tObGIJkb1A5lUjX9gkpzt1pGyoIz7G mt7l41LiGYZgNnfY8BqZTsNTGburKkSrFRUxsxjt8Is2x1azPA5Ux73wv5sMJTjt+AIA sxQ6HFzaq3YTybQjLrhbaAv6DQcOa7puflxqghTtJ7nZwLRfOifNsmbn4kyETKQqID6P hTTw== 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=jvWJ7p9WZaJREhuM17CusYFhZD3EHa1GLzMUoO+q6kc=; b=QipvZoZYD9GlW9qxL3fqyIP5nEMe2JD3qcNs/LZ4e2zvlpHn5MPdd3JHJwGWJ1C8ue ooZDAXECFroqeKTffOxYOSVWI+Hi+gyFXwR1DjmDcngTwAkL+8lamNAyBtxG3mhuwUr/ JQAoYYxB3UtSt2Mpgf77VkfBsIfb7IMljRoGjDSM6W3hUv3mixXaHA4nFEBZ+hyh5Y3X gHk+sDaAqdBO0nMkLQGR+36gkQu/XnE37+RRAaukBqZvKZBIplHsgJ5S9+1pIBjei/jn ngjyeZQwqPnWG4WgBUxtEoM1KRsDnYrmTkOdp0rD8opn5gIFd+ffR45/6AgfoED3AS0T PDFA== 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 h5si965496ejo.265.2021.09.15.13.02.20; Wed, 15 Sep 2021 13:02:22 -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 063CC68B00F; Wed, 15 Sep 2021 23:01:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F379668AFE9 for ; Wed, 15 Sep 2021 23:01:49 +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 1mQb6L-008Bd4-0J for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5NmAUWtljeHQb5NmYO6J; Wed, 15 Sep 2021 22:00:49 +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=_yEADIHsjO0q-FVGkVUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:47 +0200 Message-Id: <20210915200048.6691-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915200048.6691-1-michael@niedermayer.cc> References: <20210915200048.6691-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/apedec: Fix integer overflow in intermediate 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: TK52HSxyGq14 Fixes: signed integer overflow: 559334865 * 4 cannot be represented in type 'int' Fixes: 37929/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6751932295806976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index bf481ba3549..23318be0613 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1337,7 +1337,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f, absres = FFABSU(res); if (absres) *f->adaptcoeffs = APESIGN(res) * - (8 << ((absres > f->avg * 3) + (absres > f->avg * 4 / 3))); + (8 << ((absres > f->avg * 3) + (absres > f->avg * 4LL / 3))); /* equivalent to the following code if (absres <= f->avg * 4 / 3) *f->adaptcoeffs = APESIGN(res) * 8; From patchwork Wed Sep 15 20:00:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598416iov; Wed, 15 Sep 2021 13:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNZCuQOYZfzodjqVdb7sFpYBJLcRTp4IT1P+fQRGm1ZixvAsU6i+lCnp2t57p/mNQtDpyO X-Received: by 2002:aa7:c0ca:: with SMTP id j10mr1944901edp.146.1631736122506; Wed, 15 Sep 2021 13:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736122; cv=none; d=google.com; s=arc-20160816; b=bWWaxxSHL+8spJq5q9wFBP8BUMNgvsWL7JF5HqLhfEPahJphqQFyZgrJGi4Injczyd HYW/CiJqCxPo2avzqpEOe3SHvzU+MMzLUsMqs1XyoqkjABg+RxpDVyrWsfBtJ7vFvmrG WuFR9BnXGBvtegoApqQjKrymvK0hrtsWIUB1MP6Wx4LwB/cQy3SrRGCu0NKxUt+zuYY0 o7r4VmSBZCYbGa2fR9qC+EqzPyMmjdd9cabVjUriWTU8JK9TNMIz/Iw6JYJzEVuX/jX9 5IN/2LE5uh6ypXoQl48oyIJo6q2XNyQCvWAES5rat3u7FYbN/zm7bQ5Ap+wWHPMB5jJn FtEQ== 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=jnQaQpVCNKKldHGmpfezBD0kO7SrLXk26wM7tqSc70U=; b=PJxFcRTwemN8E0NNj3irD7x1Ui9jQYNOIHhbR/mzbMfQcjQ8Ohw+Krh4zwlLCWOytv It2e6ax0ZZmiZUeznGb0iDQx0ev2c0kzEu/4Ty4DIdlRiAr+Xwu+aPtYNvMyV4Dn0THP PSu/WMCHvzlCgYRe2QZ8a3/2aeLP1u6ojrvQ8GVU796HCT2cLnTIkYXq1lAjhMcLITHH 9/bt9zjhC0p/ff64tcB/zgRP6J6Urzc4h2JJ1uQtSVcPtJTSJuB6Z8SCXxFNy4uyQ6n5 jcTeaqTuNikxlKyGr5GKvTME52qXu7vuKODDhri/lreBA1LIx+Sa0IzAaM5PntgzjfYa Fq2Q== 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 8si933557ejd.768.2021.09.15.13.02.00; Wed, 15 Sep 2021 13:02:02 -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 031DB68AFFE; Wed, 15 Sep 2021 23:01:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFABF68AB17 for ; Wed, 15 Sep 2021 23:01:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mQb6L-002WpC-0I for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5NmAUX9ljeHQb5NmYO6X; Wed, 15 Sep 2021 22:00:49 +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=mythYh0_dn2ERnddQPoA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:48 +0200 Message-Id: <20210915200048.6691-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915200048.6691-1-michael@niedermayer.cc> References: <20210915200048.6691-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mov: Fix last mfra check 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: Ly5MsqqUrcZ0 Fixes: signed integer overflow: 9223372036854775360 + 536870912 cannot be represented in type 'long' Fixes: 37940/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6095637855207424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 4bc42d6b20e..d816242c0b7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5109,7 +5109,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) // See if the remaining bytes are just an mfra which we can ignore. is_complete = offset == stream_size; - if (!is_complete && (pb->seekable & AVIO_SEEKABLE_NORMAL)) { + if (!is_complete && (pb->seekable & AVIO_SEEKABLE_NORMAL) && stream_size > 0 ) { int64_t ret; int64_t original_pos = avio_tell(pb); if (!c->have_read_mfra_size) { @@ -5120,7 +5120,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) if ((ret = avio_seek(pb, original_pos, SEEK_SET)) < 0) return ret; } - if (offset + c->mfra_size == stream_size) + if (offset == stream_size - c->mfra_size) is_complete = 1; }