From patchwork Mon Nov 20 20:26:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6234 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4375436jah; Mon, 20 Nov 2017 12:27:07 -0800 (PST) X-Google-Smtp-Source: AGs4zMbIwyeBEyLztxlQc9QTb3QCVEKqDr2YVxpzpJKSKx/pqR5bKE8os+vouqov6LitqFKQi+y/ X-Received: by 10.223.134.185 with SMTP id 54mr11617736wrx.128.1511209627675; Mon, 20 Nov 2017 12:27:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511209627; cv=none; d=google.com; s=arc-20160816; b=ifdv9yCvO9UnYzraGPzNXP9hTLXN0U0SimYYAixe1YfuOqWmbkDQSLZ5e7xCkoVqld OzMJZHcl9PwANljUl8nBS4TAXyEV5bjI5/VqSBMSRNzVIWe2uwjppw3g2KQTDXmYKY51 mc71U5qTChRbFnYDdPq6XlD4T0RUtN85AesEJU8UTp3lUW9sFyUyAjVkWwkv6D77vqij mMNkMgs7MvTFreq9vfkftc/lGjUQgi4aBCjREjtcTef+q6x8tRXYDJc6lBgzvBxLb+mc JZlWjBdgwdVKb91NuY5GgezB44UYpqBzze9eRnSRbl77zTuM8HEtkiVxrLWPgP/Vt8lo 97xw== 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 :arc-authentication-results; bh=CIQfGzt2eiJ86E4IyKAsOyRR43/MuxX8IWQzXLZmR34=; b=1G6KpFqdMF/AltgGcGFz60l51ATMunpIC5V4gEwtdJwPPfO+Jcka2ZfFqtwyx5LrFA GypJkRcTw++ewpxBiwIzEMU4nAvl5baskUKuGEn7XLbhJD43Cbz5+A8HJzo08iCdw2pt 7Kz1rbWeKhTgJGM8hHeKcB1SmGXeaCkP+gi2wz6KDi3CH6JfFOI550ud+8U1yI9ojCKX uNsHPJOGz/tcp0YTlBHtciF21FNa7SCKknoUEwlBXS9fn+qzeNYAilgbMM6Ak/a0oBB1 kmt2HcOXhIhm/NPFVFLqmAdizgHcJWQxreDhZcEbOapRB4nl8wN/VMuaJuZQ5IFMQ8QJ LVUA== 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 f188si7957417wme.223.2017.11.20.12.27.07; Mon, 20 Nov 2017 12:27:07 -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 6706F689A32; Mon, 20 Nov 2017 22:26:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB58B680C54 for ; Mon, 20 Nov 2017 22:26:43 +0200 (EET) Received: from [172.31.218.51] (helo=vie01a-dmta-pe07-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eGsei-0004f3-Kh for ffmpeg-devel@ffmpeg.org; Mon, 20 Nov 2017 21:27:00 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eGsec-0004qr-Ov for ffmpeg-devel@ffmpeg.org; Mon, 20 Nov 2017 21:26:54 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id cLSo1w01M0S5wYM01LSpBa; Mon, 20 Nov 2017 21:26:49 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 20 Nov 2017 21:26:48 +0100 Message-Id: <20171120202648.7321-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdsp: Fix signed integer overflow, 2nd try X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" The outputted bits should match what is used in the lossless check Fixes: runtime error: signed integer overflow: -538697856 * 256 cannot be represented in type 'int' Fixes: 4326/clusterfuzz-testcase-minimized-5689449645080576 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c index 4e3a16c781..32a4503b64 100644 --- a/libavcodec/mlpdsp.c +++ b/libavcodec/mlpdsp.c @@ -117,7 +117,7 @@ int32_t ff_mlp_pack_output(int32_t lossless_check_data, (1U << output_shift[mat_ch]); lossless_check_data ^= (sample & 0xffffff) << mat_ch; if (is32) - *data_32++ = sample * 256; + *data_32++ = sample * 256U; else *data_16++ = sample >> 8; }