From patchwork Sun Sep 10 01:09:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43670 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1372066pzb; Sat, 9 Sep 2023 18:10:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFP2ZtFCuIyEzagVx2Z96RiH3DrbcdfMrlsGhRn3ihBYf3ARwJt379vi98AarnbCjTUw5VU X-Received: by 2002:aa7:c793:0:b0:523:bfec:4913 with SMTP id n19-20020aa7c793000000b00523bfec4913mr4723024eds.0.1694308206368; Sat, 09 Sep 2023 18:10:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694308206; cv=none; d=google.com; s=arc-20160816; b=z1A1i2qm9zwnkGfB3apwixn7Wn50YU3AAAqNw85pftuuJwc3RsEC/SDB+g/xPKZZvA vUpIxhlCZ/LGCo74Q7u6q+nbIqN0ACnxPhGO3kx5qUHLtj0+hiOyp+z22ovl0+NVGTZD NGTY+FUI/zeZVnzfG574Ps3UJITxzinpUutvD1PE1dceV3KJiRTCFceWCJ1YiYyb9/qG 109FC59lpKfTqaw003MULu78C8Y0dvbrVgRXfUz61cRYE4ojNjjpHYSYlvD2i5bdguW8 8+Cjf8L+2NPPZRiV5q8RUJDlR+DN84WwTqLjg14LXClM3HHXORvjCKXwJLXVbq+oNAmR JA+g== 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=daNESnCQXZznSpwM1X51y9ZC53TlVO105HWTwj/ESWI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SEXKBhFmC8QH8xKI7TwRo3atC79AqTpvdgX3rhOcCs0neEUaorRtSRYIPXugF9S/fY ufKliI9fxbgbeJNUWq3z+Ef/7Ug6F/tSmE7fJ99V+uaL2crDv6Ss/9XBADnMd7jsAXyY lSNXuXUDsKcoiReMCXrehLq4ThGxjGPajIVPaT4UwWOe1BWJd9asPFr1Ux0DRJcN+UUM TBgSxNq/W58rA/N6oCf6hdAgyMgj5AF7FKoeDgduWhEWj9/gW3mKqQUknWDOG2OEagTf rKJlslC4jwyMGkug+gAXfEiVlg5tnpbNsKDREicpBqw/nHUVGWve6nfNT7OrtBtvbD/x luiA== 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 p6-20020a056402074600b005233889544esi4100414edy.135.2023.09.09.18.10.05; Sat, 09 Sep 2023 18:10:06 -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 E89C168C8B6; Sun, 10 Sep 2023 04:10:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94A3F68C6D5 for ; Sun, 10 Sep 2023 04:09:54 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BE25A20004 for ; Sun, 10 Sep 2023 01:09:53 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 10 Sep 2023 03:09:50 +0200 Message-Id: <20230910010952.24389-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/wavarc: Use unsigned for samples in 1dif, 2slp, 5elp 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: lxhIVYwnakts Fixes: signed integer overflow: 141394472 + 2038060365 cannot be represented in type 'int' Fixes: 61787/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-5882604925878272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index b954e8800cd..2e32b46ebd9 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -243,18 +243,18 @@ static int decode_1dif(AVCodecContext *avctx, break; case 3: for (int n = 0; n < s->nb_samples; n++) - samples[n + 4] = get_srice(gb, k) + (samples[n + 3] - samples[n + 2]) * 3 + + samples[n + 4] = get_srice(gb, k) + (samples[n + 3] - (unsigned)samples[n + 2]) * 3 + samples[n + 1]; finished = 1; break; case 2: for (int n = 0; n < s->nb_samples; n++) - samples[n + 4] = get_srice(gb, k) + (samples[n + 3] * 2 - samples[n + 2]); + samples[n + 4] = get_srice(gb, k) + (samples[n + 3] * 2U - samples[n + 2]); finished = 1; break; case 1: for (int n = 0; n < s->nb_samples; n++) - samples[n + 4] = get_srice(gb, k) + samples[n + 3]; + samples[n + 4] = get_srice(gb, k) + (unsigned)samples[n + 3]; finished = 1; break; case 0: @@ -343,13 +343,13 @@ static int decode_2slp(AVCodecContext *avctx, break; case 4: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] = get_srice(gb, k) + (samples[n + 69] - samples[n + 68]) * 3 + + samples[n + 70] = get_srice(gb, k) + (samples[n + 69] - (unsigned)samples[n + 68]) * 3 + samples[n + 67]; finished = 1; break; case 3: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] = get_srice(gb, k) + (samples[n + 69] * 2 - samples[n + 68]); + samples[n + 70] = get_srice(gb, k) + (samples[n + 69] * 2U - samples[n + 68]); finished = 1; break; case 2: @@ -359,7 +359,7 @@ static int decode_2slp(AVCodecContext *avctx, break; case 1: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] = get_srice(gb, k) + samples[n + 69]; + samples[n + 70] = get_srice(gb, k) + (unsigned)samples[n + 69]; finished = 1; break; case 0: @@ -630,7 +630,7 @@ static int decode_5elp(AVCodecContext *avctx, case 20: case 7: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += ac_out[n] + samples[n + 69] * 3 - samples[n + 68] * 3 + samples[n + 67]; + samples[n + 70] += ac_out[n] + samples[n + 69] * 3U - samples[n + 68] * 3U + samples[n + 67]; finished = 1; break; case 19: @@ -653,14 +653,14 @@ static int decode_5elp(AVCodecContext *avctx, samples[n] = ac_pred[n]; for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += ac_out[n] + samples[n + 69] * 3 - samples[n + 68] * 3 + samples[n + 67]; + samples[n + 70] += ac_out[n] + samples[n + 69] * 3U - samples[n + 68] * 3U + samples[n + 67]; finished = 1; break; case 18: case 5: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += ac_out[n] + samples[n + 69] * 2 - samples[n + 68]; + samples[n + 70] += ac_out[n] + samples[n + 69] * 2U - samples[n + 68]; finished = 1; break; case 17: @@ -672,7 +672,7 @@ static int decode_5elp(AVCodecContext *avctx, case 16: case 3: for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += ac_out[n] + samples[n + 69]; + samples[n + 70] += ac_out[n] + (unsigned)samples[n + 69]; finished = 1; break; case 15: @@ -695,7 +695,7 @@ static int decode_5elp(AVCodecContext *avctx, samples[n] = ac_pred[n]; for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += samples[n + 69] * 2 - samples[n + 68]; + samples[n + 70] += samples[n + 69] * 2U - samples[n + 68]; finished = 1; break; @@ -712,14 +712,14 @@ static int decode_5elp(AVCodecContext *avctx, for (int o = 0; o < order; o++) sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; - samples[n + 70] += ac_out[n] + (sum >> 4); + samples[n + 70] += (unsigned)ac_out[n] + (sum >> 4); } for (int n = 0; n < 70; n++) samples[n] = ac_pred[n]; for (int n = 0; n < s->nb_samples; n++) - samples[n + 70] += samples[n + 69]; + samples[n + 70] += (unsigned)samples[n + 69]; finished = 1; break; @@ -731,7 +731,7 @@ static int decode_5elp(AVCodecContext *avctx, for (int o = 0; o < order; o++) sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; - samples[n + 70] += ac_out[n] + (sum >> 4); + samples[n + 70] += (unsigned)ac_out[n] + (sum >> 4); } finished = 1; break;