From patchwork Tue Dec 6 23:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp53793pzb; Tue, 6 Dec 2022 15:48:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf6iw70+WNLfWqQceGgUX6gFGnIUKT/o3EnR4o7id56xUA5R6budwvFL6Cio4zUewMPvLoHD X-Received: by 2002:a17:906:a155:b0:7b5:576e:b7d6 with SMTP id bu21-20020a170906a15500b007b5576eb7d6mr66691440ejb.127.1670370500521; Tue, 06 Dec 2022 15:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670370500; cv=none; d=google.com; s=arc-20160816; b=FpdeKq1vpf6uMJU+9RXaAkJ4Z3KrEwCntZ6PmOkdvtH7UoA4dlJpsjiNiLJVigGmoo ZFe2BFh3MwGZrpSeBpa2g9ICoWJ1vNuLnQojQy+UnqjOy+zmFhTQT4+xHVXZ7pSiV3Yj zUA2mvDCJ0sTF+Buj4F6hDSs0WRvEdsLUw/L5w2aHyclWShb6QO7w7i3gJ1nUn/WfgSx nv305iIMCB6YMD5kN91rHSoYFxWpB581IUjrQuNVieTjw9uybDvi974jc5b7ERqM7Feo Y+dOWGsdNA1w1P/9Mre3AP6CpjSuPgD8GeO+PHm+5MAaHvbBkM0a3uB9oESByRS+Aech HZfQ== 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=JFEeSXWIckrpQZDqvhO8NaK8gjJUqW+e92tj99S9y/s=; b=h3HGCLGfoM/lK5AQIP1wTHuRdTXlgQdlKHTPdL3JILDExDUe4x0D8yX+QCe42krEXm tKHoJKYJQLG9rOBLPrQL2xxlUdtttNwXyLufLTmKFcwZ9O8Ixqt/cWM2qnZoX8lk2NoJ yYnjV7NiTWIzH83eBavDsUsRTjHXBxBGgfNtUmbke4ZRlj2++c1xCpbiOuONsSPtzsKf j0uD1aA9yEC1go5HuIEpU0I3x+I6B9Cha59HKQY+smCpswsxOMo01zbiVP0cMlmZhIaW emnJmxpFKAqPNLgdUNetUa4WCxfwny6hI/zvpOa6QLiFfqonWNsycxreuTpZMJiA70Ew 33nA== 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 b19-20020aa7cd13000000b0046a2b7d2452si2896308edw.255.2022.12.06.15.48.20; Tue, 06 Dec 2022 15:48:20 -0800 (PST) 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 6C96F68BDA7; Wed, 7 Dec 2022 01:48:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3037D68BD97 for ; Wed, 7 Dec 2022 01:48:10 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 784A9100005 for ; Tue, 6 Dec 2022 23:48:09 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 7 Dec 2022 00:48:07 +0100 Message-Id: <20221206234808.10024-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dts2pts_bsf: Avoid searching for poc == INT_MIN-1 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: mqrec2TezdWu Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int' Fixes: 53876/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-6569754750222336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dts2pts_bsf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c index 522d5e1eb0..48612e59db 100644 --- a/libavcodec/dts2pts_bsf.c +++ b/libavcodec/dts2pts_bsf.c @@ -461,9 +461,10 @@ static int dts2pts_filter(AVBSFContext *ctx, AVPacket *out) poc_node = av_tree_find(s->root, &dup, cmp_find, NULL); } } - } else { + } else if (s->eof && frame.poc > INT_MIN) { DTS2PTSFrame dup = (DTS2PTSFrame) { NULL, frame.poc - 1, frame.poc_diff, frame.gop }; - if (s->eof && (poc_node = av_tree_find(s->root, &dup, cmp_find, NULL)) && poc_node->poc == dup.poc) { + poc_node = av_tree_find(s->root, &dup, cmp_find, NULL); + if (poc_node && poc_node->poc == dup.poc) { out->pts = poc_node->dts; if (out->pts != AV_NOPTS_VALUE) out->pts += poc_node->duration; @@ -480,7 +481,8 @@ static int dts2pts_filter(AVBSFContext *ctx, AVPacket *out) poc_node->poc, poc_node->gop, poc_node->dts, poc_node->duration); } else av_log(ctx, AV_LOG_WARNING, "No timestamp for POC %d in tree\n", frame.poc); - } + } else + av_log(ctx, AV_LOG_WARNING, "No timestamp for POC %d in tree\n", frame.poc); av_log(ctx, AV_LOG_DEBUG, "Returning frame for POC %d, GOP %d, dts %"PRId64", pts %"PRId64"\n", frame.poc, frame.gop, out->dts, out->pts); From patchwork Tue Dec 6 23:48:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp53874pzb; Tue, 6 Dec 2022 15:48:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NNlaSEWUqUWo9h29wk/OLakiv4669HJmpf5/B6tQHuLERa7ueQutjOdijgcsChREu531b X-Received: by 2002:a05:6402:3719:b0:461:4f34:d8f4 with SMTP id ek25-20020a056402371900b004614f34d8f4mr4518235edb.144.1670370508911; Tue, 06 Dec 2022 15:48:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670370508; cv=none; d=google.com; s=arc-20160816; b=CwHwhmCpdrHTSFcBLoke3aaA1YHt41eTXnh933JDHXCEc3eRLIRwJN1FPN5GipRVJ2 GOKyyF8hPA0Fe2Ezw4j/E1TV/X0s3PiZhWNeDb9Gb2tlH1PkhTIi8FDRLGz4z3VZvvBA EortyG9yVKfOivWWlFygnE8JOpqt0xBsZpIJZJjBMTaiYsqDmh2rPHRfhNQaNBuZKA0K mr5apU5nZePIM2C53kb4pQR2rYHrhLOcTvZykgeQo7dTgb/JCbyTqN8Wpn2paf1I3uyB kEKnO+2i+P5anfG08a2ui/IhKtAzDEvZIptEa+ubjujJav/61ttbA1eC6f9Y5u9tKrWf AR5Q== 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=JAGcbHBbsEzbAjadIE94ogHuBh0uJzmAhZoJG68USG8=; b=DVooS0QxXtQU28BLqmvwuauHy93s6eulWYAinxyCOLuz5H6KZpAzPObOcExWKiOugk g3Q+Yqqa1w5l/WeE/E6H5tsbPFyXlEHr1/TlEvsB73aDGqZLjOolhSCq7bCDaQbnypg4 exM2sR39b6KwA9Gl2ycGc1lyi2yFLBaU20Ncpx+2iF2rtF1GsC/M8SNHgtmwF09uKP19 TeVJYYDICKsSkuH25/PYMaoJ7W5mXAcbCqSiUJQLqnBWYWj7dNtUQZodDIIXq++fZXiG a60+qR9Ee91ORTVsSbw/zzzidePHIdpoi1wS2VuC86YbAlntYEJp26ZY9clfF9Nnfn5P TmjA== 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 b19-20020a056402279300b0046abb9e43a8si3428245ede.321.2022.12.06.15.48.28; Tue, 06 Dec 2022 15:48:28 -0800 (PST) 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 65B6968BD9C; Wed, 7 Dec 2022 01:48:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 584A968BDA6 for ; Wed, 7 Dec 2022 01:48:12 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A0C821C0004 for ; Tue, 6 Dec 2022 23:48:10 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 7 Dec 2022 00:48:08 +0100 Message-Id: <20221206234808.10024-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221206234808.10024-1-michael@niedermayer.cc> References: <20221206234808.10024-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avutil/tx_template: Use more unsigned ints to avoid undefined overflows 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: 2dJMbOZRNPun Fixes: signed integer overflow: 574590586 - -1875616554 cannot be represented in type 'int' Fixes: 53914/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5037125846564864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/tx_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/tx_template.c b/libavutil/tx_template.c index ac3dc22a2c..983de75a47 100644 --- a/libavutil/tx_template.c +++ b/libavutil/tx_template.c @@ -659,7 +659,7 @@ static void TX_NAME(ff_tx_fft8_ns)(AVTXContext *s, void *_dst, { TXComplex *src = _src; TXComplex *dst = _dst; - TXSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; + TXUSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; const TXSample cos = TX_TAB(ff_tx_tab_8)[1]; TX_NAME(ff_tx_fft4_ns)(s, dst, src, stride); @@ -680,7 +680,7 @@ static void TX_NAME(ff_tx_fft16_ns)(AVTXContext *s, void *_dst, TXComplex *dst = _dst; const TXSample *cos = TX_TAB(ff_tx_tab_16); - TXSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; + TXUSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; TXSample cos_16_1 = cos[1]; TXSample cos_16_2 = cos[2]; TXSample cos_16_3 = cos[3];