From patchwork Wed Feb 14 12:45:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7597 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp727196jai; Wed, 14 Feb 2018 04:45:43 -0800 (PST) X-Google-Smtp-Source: AH8x226e4N2lOtfjYbS1AGFf3Df/njcDNWArRVK+Q4fT9HU4LXhcZnd/cXBztTzuVEZO6SHJ1R64 X-Received: by 10.28.232.16 with SMTP id f16mr2139874wmh.92.1518612343487; Wed, 14 Feb 2018 04:45:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518612343; cv=none; d=google.com; s=arc-20160816; b=i+u6n0azU7jE5BabKQMcWlmAduE4aTDp0prhJUbSBkx4HuerLzAIAYPI8JZwKekysQ kDXI+ujqELVaLwz2gvTK+vEF17o+YDDhWlZlHhYhnXD2S5VF5y/o3W3gF1lyPwjnBaw0 oB0DFsjqQXeoF7oGDS+o9SrmWqJk/XaxNvsWRstitiJO7oJcMtja+/eu7X6IDH0qiFYa RmfAkMQ8OxRLRWpw51G4L1rKZ6bjpHnxmi8lgX1Sn066ssI/vg4e1h6FAL06I3loAOIF D86tsNMfmo9h5Ldf41SXUk8nj5rICbwleeaOHsj0us23vCOP813dmEQhnWJjeaxiUaYQ HkGA== 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=8i7UICDgOJyT6nijcvLS/Jxf4NZOhA2YCKEABVl8BQg=; b=iPvPtCHybOEie19Qsp+EK2fes9lE3MNw+aCTWTrlOoAm8aC3bVk0334b8vo7wVniF1 91fCo9KvXb+cqyGp6mLvEjO++wD4D7Hc7E49sZS8nl6kSFR7HT1yB3xkzW+Ym3lFSLLG rxcdN3uA1eu53oKW60EDgVk/w+lX4lNOcGNU45J0m9nNcuQkAUqSad6CRowix0FdPcRZ He5IQickDMBkwT6jBR2Ls4Y5AdN5M6sFKjwP1z254/mH5zR6AovbxTO7uCyap0AZwkQ5 JbPxzxdNqEvT/HwLe1qMwaIfZ8lg0EvuTHUFHTAS8cf8nC7e9aLQ4+/SKWp+yvwWTsBw DDqQ== 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 n123si1043183wmg.118.2018.02.14.04.45.43; Wed, 14 Feb 2018 04:45:43 -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 76545689FB7; Wed, 14 Feb 2018 14:45:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD2C689FAD for ; Wed, 14 Feb 2018 14:45:23 +0200 (EET) 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 1elwRK-000278-VN for ffmpeg-devel@ffmpeg.org; Wed, 14 Feb 2018 13:45:34 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id AclQ1x01y0S5wYM01clRyd; Wed, 14 Feb 2018 13:45:25 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Feb 2018 13:45:24 +0100 Message-Id: <20180214124524.8711-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avcodec/exr: Check remaining bits in last get code loop 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: shift exponent -7 is negative Fixes: 3902/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6081926122176512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index f08576af22..47f59bd638 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -558,7 +558,7 @@ static int huf_decode(const uint64_t *hcode, const HufDec *hdecod, while (lc > 0) { const HufDec pl = hdecod[(c << (HUF_DECBITS - lc)) & HUF_DECMASK]; - if (pl.len) { + if (pl.len && lc >= pl.len) { lc -= pl.len; get_code(pl.lit, rlc, c, lc, gb, out, oe, outb); } else {