From patchwork Fri Dec 15 18:45:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6796 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp855705jah; Fri, 15 Dec 2017 10:45:38 -0800 (PST) X-Google-Smtp-Source: ACJfBovn+XJRRX25Iexg7WKoGBzIlFK7OC2LozThltIrm5chn9jC8DB9NkKNF7FbvZw3+bg1VgJp X-Received: by 10.223.160.184 with SMTP id m53mr10130778wrm.126.1513363538677; Fri, 15 Dec 2017 10:45:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513363538; cv=none; d=google.com; s=arc-20160816; b=HgpNk84x+U5jNd4ap9njf+G82mWzAMWRUz8Qrt+Bqqw/Yl2Zbfav+CIAxMvmN5J3RM ArGgP7hyX0yK1SWHFfiuVPa0OIaNLeaiyCxLKprI0YpdQokkufd/XZQMvOinOBCfAaRp vqDYfY5gc4aVjewaX4B36uRFBfsT8/AUIC1p9xbV8jjjaRr+uJFR84OX7Sqefk6eplfD oOvqwFV/C2OOXEJcdNtGnZiVeSYze/qntoS/e2O/iFlEvHCOhtbsu9qWDeRE8heYyvEX 4muhUhIIgj/LH4dGU9fXRqUHlHstIqq2XYExUUNLMrQFTKmyDvmc6Uo8komp+R0TulRe aZAw== 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=2d+Txm2yMxz/dwqPq4l86l5MZOw5GLDkpsAqO733iP0=; b=qAnW2bERyEcjrJtFe6EA3CR7cIIgP4j0PPKQGRj+U/kyIltIuA0+G9Kx2HvOIdCDFC Q8lJEAg6ApJ5f5p/ilD136BXrB4LINnbjgTo9cCYDCiQcPMMzaoEJwZYHk83UlRHM8v4 zJA/AzKO8YzRq30LwcKHt0x1oQOPhTPjMYzyVSNmkwDPM3rkm0Yj15tZgQ9bFWi17pln 5fRHmRVnB64ksTASMTA5vDFgwNuLQ3v8/5euszC/8yIk6uzypzP3CwkMQoMBioZX6HGq Pd2SHKhyUAfC0eFaC5JjQYJCXs4sHqIcE4HwJAfOEa9TMgS52ZvqrtKZTGbT2pmFpIEu 28tQ== 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 x193si4635235wmf.44.2017.12.15.10.45.37; Fri, 15 Dec 2017 10:45:38 -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 464EE680B87; Fri, 15 Dec 2017 20:45:27 +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 5174A6808CC for ; Fri, 15 Dec 2017 20:45:21 +0200 (EET) Received: from [172.31.218.31] (helo=vie01a-dmta-pe01-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1ePuzC-0000Y2-9q for ffmpeg-devel@ffmpeg.org; Fri, 15 Dec 2017 19:45:30 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1ePuz6-0006Ko-S5 for ffmpeg-devel@ffmpeg.org; Fri, 15 Dec 2017 19:45:24 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id mJlM1w01o0S5wYM01JlNuw; Fri, 15 Dec 2017 19:45:22 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 15 Dec 2017 19:45:19 +0100 Message-Id: <20171215184521.822-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/hevcdsp_template: Fix undefined shift in put_hevc_qpel_bi_w_hv() 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 -3 Fixes: 4524/clusterfuzz-testcase-minimized-6055590120914944 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 0623cfad89..4017af8eb0 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -1051,7 +1051,7 @@ static void FUNC(put_hevc_qpel_bi_w_hv)(uint8_t *_dst, ptrdiff_t _dststride, uin for (y = 0; y < height; y++) { for (x = 0; x < width; x++) dst[x] = av_clip_pixel(((QPEL_FILTER(tmp, MAX_PB_SIZE) >> 6) * wx1 + src2[x] * wx0 + - ((ox0 + ox1 + 1) << log2Wd)) >> (log2Wd + 1)); + ((ox0 + ox1 + 1) * (1 << log2Wd))) >> (log2Wd + 1)); tmp += MAX_PB_SIZE; dst += dststride; src2 += MAX_PB_SIZE;