From patchwork Sat Nov 18 00:33:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6152 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1271042jah; Fri, 17 Nov 2017 16:33:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMZm6ySzVbuQaKO/0BJN9E+PNOnXV1aKaGgo56R5JQpAfvyJcmVHH5uTtMSey37RTWq3WZaI X-Received: by 10.28.15.141 with SMTP id 135mr5389764wmp.74.1510965213384; Fri, 17 Nov 2017 16:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510965213; cv=none; d=google.com; s=arc-20160816; b=TGNheZQ7Wd+4GkOcyJs51GL8IXGuCvyYgoJqqJwUb8+NfKcThAGsMaD4jMfhDIQyRB lH06yqwvpccMbCo2GiaW+f6DRQ3mO38+ELqJcLAgQ/cWyeCdSWfS7zLLlYE66Cntjw6D 9WgQs6DTo2VX+UQH6JIavZq+39ymvPzF33m9648HASqv/Syi2lHcDXMQQCsArWKtGUdd wFPDkhf1yEbrZE09mbSMkxSSATc1IQOFKO6X0ekNqkt3od/cTrSthQFUg11jtCDYy1j3 S6HdM6Lib3DV+WYbL1jte6F3OMBp0WmJn6BErmxNvV3r8JiQXTJ8i0R7M+YDLtslROQG DvYQ== 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=zC1fzdfp6zb+aGsSHS2zSN6xBMTYz/CTLp0xoGRsw6M=; b=ZMoiBLeTczPd4JnYrV3eldBFtIlCf7rp0EmoxAb8NdceAswiEU5jfrjHUfcpGpehu0 grrHmQCudFspmEkFxJpYXtwEWOi9JpjWqzAWKktjGW+u9hw4/G5m/odEm8u3H4pywNTU Vihyp4fQd2fzujhNkrOu40fpwsNuIViNSgWelzaTQGrIUngC0ZQLzMgiTCfPio1taFz5 kNr4+EPzlL6khX+6S+RoprvbHE/jtRoQu1xXp6zI6B3rXe7pnxezYk84cCpYBHxRUTfp DgAUDsAjMHgk+sqhHQQsO88snlTX02nHae/XqUFbiSXfgNYoCMjvib1ubUImqWp/CT98 E7XA== 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 o18si4016662wrh.357.2017.11.17.16.33.33; Fri, 17 Nov 2017 16:33:33 -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 9E5A5689A40; Sat, 18 Nov 2017 02:33:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 465B4680646 for ; Sat, 18 Nov 2017 02:33:09 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eFr4X-0001eQ-2N for ffmpeg-devel@ffmpeg.org; Sat, 18 Nov 2017 01:33:25 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id bCZJ1w01B0S5wYM01CZKxv; Sat, 18 Nov 2017 01:33:20 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Nov 2017 01:33:17 +0100 Message-Id: <20171118003318.31683-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/hevcdsp_template: Fix invalid shift in put_hevc_epel_bi_w_v() 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" Fixes: runtime error: left shift of negative value -255 Fixes: 4037/clusterfuzz-testcase-minimized-5290998163832832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdsp_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index e09c661759..46a0da2045 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -1407,7 +1407,7 @@ static void FUNC(put_hevc_epel_bi_w_v)(uint8_t *_dst, ptrdiff_t _dststride, uint for (y = 0; y < height; y++) { for (x = 0; x < width; x++) dst[x] = av_clip_pixel(((EPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8)) * wx1 + src2[x] * wx0 + - ((ox0 + ox1 + 1) << log2Wd)) >> (log2Wd + 1)); + ((ox0 + ox1 + 1) * (1 << log2Wd))) >> (log2Wd + 1)); src += srcstride; dst += dststride; src2 += MAX_PB_SIZE;