From patchwork Wed Nov 16 23:32:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp739144pzb; Wed, 16 Nov 2022 15:32:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf66tf9id3urldoy0O+SQ1wc0/W5MEYoSAJW5KkNfTsymNbMITixN2sRThaInjnIGSFSI3tW X-Received: by 2002:a17:906:64d:b0:78d:e4c6:2c8b with SMTP id t13-20020a170906064d00b0078de4c62c8bmr98401ejb.164.1668641573556; Wed, 16 Nov 2022 15:32:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668641573; cv=none; d=google.com; s=arc-20160816; b=Wf3ukQGXJv33HwVTI257k7EqCoo+JVyu4To6tjAkm5uhBiiUCKwCA3rdxuu3usxS0g pp+GRhKhbJS1YFxM5k51UlUW8ggD0ymO8TeCgwIY5a8gOujvFZV2dqiuZqqFxxA62CWd 5fEnykOZGr0NeVxtzO7dPCSIhw9COLutd4s/krZ6DDpxPYkj7QIwH0+zqN9s0+ulWIin +W/NNyWTFq7TBoFEpOsuZREwNtNOY3XBzVNLeQdzrtfIAcsfMUkDoIMN6gTCUXqAe9AJ 05I7P56O0SlWNuKWrADlXcxOazYeIR8dhFW3U5f1A6Q8r/TIXPwYldD1kK7pmROYWs9G YJiA== 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=FR8uqt88lxYKXC9eD7oAHAjOyIMrlugOdwWFpe6Vq+k=; b=00JwD+T+l5wO8RivC1vKrn0T81eucx3BEwSCU+70w92dTrc+HFeoUGz54SuVKvQzUr Vq1kOXvs/Q/imKwLMFebzxtODAprZOMQ949R6j/6kuARLbvo4joJc0rVkPhyLGjB2BVB b+/sVGJk3ue31CE7DSkjJgIrZEPnBy2DBXXKbEtdV3bhb/FmOst594AVcXxOvm0nV+tM cHB3JkMicKhn60IBNSBM4ZzlIfIcCIs1lFiecKOUC2BKOwU1XjPG39g/dwmQ2gdF/2eB JpTFNrDaN2sQVckPeuOVG2zRFkvwFaA6mNL1vHMWAKg/YjnHYZRs1TWmrtNE1ra0YdrB /8aA== 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 h11-20020a05640250cb00b0046786a5845bsi13399552edb.567.2022.11.16.15.32.53; Wed, 16 Nov 2022 15:32:53 -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 16FC768BD18; Thu, 17 Nov 2022 01:32:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1118968BB10 for ; Thu, 17 Nov 2022 01:32:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 6904D60005 for ; Wed, 16 Nov 2022 23:32:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2022 00:32:20 +0100 Message-Id: <20221116233220.5183-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221116233220.5183-1-michael@niedermayer.cc> References: <20221116233220.5183-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/apac: use unsigned for sample residual 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: x9aP/AWyT2hN Fixes: signed integer overflow: -2146670226 + -2227242 cannot be represented in type 'int' Fixes: 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apac.c b/libavcodec/apac.c index e9f6a0dd88..72ff41bdbb 100644 --- a/libavcodec/apac.c +++ b/libavcodec/apac.c @@ -204,7 +204,7 @@ static int apac_decode(AVCodecContext *avctx, AVFrame *frame, for (int i = 0; i < c->block_length; i++) { int val = get_bits_long(gb, c->bit_length); - int delta = (val & 1) ? ~(val >> 1) : (val >> 1); + unsigned delta = (val & 1) ? ~(val >> 1) : (val >> 1); int sample; delta += c->last_delta;