From patchwork Tue Jun 18 13:48:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2569645vqg; Tue, 18 Jun 2024 06:49:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1MpsSjXBLTzqcwbpadE5dcXf1Lf2rc/zQ6sAEiPS0k7t1oWQGgw2M8f9JGm+FnXDUSLRkTJZ0AR9u2PmJQHPXsAGgMnOHgHUg8w== X-Google-Smtp-Source: AGHT+IHUHbRYC6wETztTw6Kp82X27XB4x7vbfwRmAd+KNMqBP21C2xIuNfHIi+3cJXABx0SDd6n9 X-Received: by 2002:a2e:9785:0:b0:2ec:2038:925d with SMTP id 38308e7fff4ca-2ec203894admr69287171fa.1.1718718559619; Tue, 18 Jun 2024 06:49:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718718559; cv=none; d=google.com; s=arc-20160816; b=mgZm3QANcAAdmRBod5HtJrRK0NdbbTHpW+DjSD6YvkcZKzTuJ5+hpo4uqWkRYVmtqw 65Cpbj2cacBrf980XLVMSrrngsUvfE0JnNQWTX9DQoTj/yi79INbOspyj7OSeIp+kMoH aiqoMEo4kW6myS4pIgPnflEixXX0zPhcPS3kexnzNtVyQSu26Fu7/zAF7BVxDlkhS0Ce v2/0bQtsiq136/P6m0FvFA9cMlnqGjI7Xh6aA7wq4rTrmlAx8zSrhZ5aF0gG5W8y0gNb nXr698jdvn+LIposek+6GUdreDVMbaeZsjCy14/dAuF9SZBdNe6DSv44HPmmp//WC37X Oddg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=5Xwu4MfEuLaPvwvKyR8xl8kOF72qRv3C3RvgF+XDD7w=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=HZCH44K7dSU3SJQ1KjZFofCeF/MpevG863uQkyOk2jhRmf8pTpKGGmTPiKE4PZ+CKw OlgdQ7yx95blpXpc2HQ52ciQfjnoWBD6UVdfH0T4D/nyGtydeHlI4I7cWslB1GwIZbNF 90DdiF/+ehZrS45VATol1uRD0rWIn+910s1U11S0GwU3y7TnugSEZaQDg1CDTfja20Si tTMSQd7pOQMDkTrT7N5vOB2ucxkpSn6+erwB/DNulqS9dhmPGfbcMtg4B2YXczXdoo05 Hosg5zmaQikUV6aIXv51WJ5XTgUhCA6s03LfOVPUygnBXRuSGf1zbSoXXBYOWOTXC8YI aTGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BFYRBXh2; 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 a640c23a62f3a-a6f8e53ebbfsi127205266b.805.2024.06.18.06.49.18; Tue, 18 Jun 2024 06:49:19 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BFYRBXh2; 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 7720E68D7E3; Tue, 18 Jun 2024 16:48:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34F7B68D7BE for ; Tue, 18 Jun 2024 16:48:32 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 68DAAFF80C for ; Tue, 18 Jun 2024 13:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718718511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XBT1n/0Ja9mevrJkxAIK2LG1Vo8zdStvg8tcbUBKhNI=; b=BFYRBXh20SRE/DTrCpIegaatqQsp5AktFL/RPEqtVnKLAl0I8ade/AezIOCqIsN5KyFF+P L3zJUVeVS4qctboGt5hClmV8ZwTpeidcoVr3GFS3PB2SawrS0bXFaBG8a21KIWGpFxRsBe /JcJrq9eUHlOFQqTBKg/UFMdpMAWHi5YMWPaul2lrDi6CbaVp8DdFVIHel9kssGpniQ5U8 t4j2aj01vExjvjtQSeBzhdfQh4/zIiLJf4ytV1qvevPqfVQPcoMyhyqBAnGZODolZr0abx 44OVHitb8ZYYu5SzteyBAr5ijf5EeVjO0+PY35wZs5HQTXWmwWI9utGHGtpxNQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 18 Jun 2024 15:48:24 +0200 Message-ID: <20240618134826.2189719-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240618134826.2189719-1-michael@niedermayer.cc> References: <20240618134826.2189719-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/jfdctint_template: Fewer integer anomalies 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PiVy3DMC7EkW Fixes: signed integer overflow: 105788 * -20995 cannot be represented in type 'int' Fixes: signed integer overflow: 923211729 + 2073948236 cannot be represented in type 'int' Fixes: signed integer overflow: 1281179284 + 2073948236 cannot be represented in type 'int' Fixes: 68975/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PRORES_fuzzer-6266769177116672 Fixes: 68997/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PRORES_KS_fuzzer-6284237161431040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jfdctint_template.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c index ca17300c324..aa2680132ee 100644 --- a/libavcodec/jfdctint_template.c +++ b/libavcodec/jfdctint_template.c @@ -69,7 +69,7 @@ #define GLOBAL(x) x #define RIGHT_SHIFT(x, n) ((x) >> (n)) #define MULTIPLY16C16(var,const) ((var)*(const)) -#define DESCALE(x,n) RIGHT_SHIFT((x) + (1 << ((n) - 1)), n) +#define DESCALE(x,n) RIGHT_SHIFT((int)(x) + (1 << ((n) - 1)), n) /* @@ -175,7 +175,7 @@ #if BITS_IN_JSAMPLE == 8 && CONST_BITS<=13 && PASS1_BITS<=2 #define MULTIPLY(var,const) MULTIPLY16C16(var,const) #else -#define MULTIPLY(var,const) ((var) * (const)) +#define MULTIPLY(var,const) (int)((var) * (unsigned)(const)) #endif @@ -261,7 +261,7 @@ FUNC(ff_jpeg_fdct_islow)(int16_t *data) { int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7; int tmp10, tmp11, tmp12, tmp13; - int z1, z2, z3, z4, z5; + unsigned z1, z2, z3, z4, z5; int16_t *dataptr; int ctr;