From patchwork Sun Apr 9 14:26:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1598515pzb; Sun, 9 Apr 2023 07:26:41 -0700 (PDT) X-Google-Smtp-Source: AKy350ZHNwOb7iCM+9qlw41rjf5aosdpaVBh2iwggA2iTpnu+bksR1q5wphxOzGpXv8y79n9yFM3 X-Received: by 2002:a17:906:9711:b0:94a:76f6:8e52 with SMTP id k17-20020a170906971100b0094a76f68e52mr1244470ejx.35.1681050400891; Sun, 09 Apr 2023 07:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681050400; cv=none; d=google.com; s=arc-20160816; b=O7TkT2uat4yM+gt0IjicNSgIZFoV4B7dR0Uyn+etMMXhvjB4YHjcAD8eH89q+E14tP zW4dEiKFBmrwrwUTPu+ZOLCYdT+7brRdviWpIcZeR1pLZRyJiR6KgxaExoCSDqmCNovo Lrr411+sgy/KtoCs3UVSWnR+k6uE8W48sxdBnYjAU+Otyp34swwXaURM1m6n1ppz5LQa XBqkmdSoDj4KJwFQV7Dag7oNqgdXn5t6z5eEBDajAEPmg1w1oPMZLFAbgItBeJycfRnI G2m++Kw2XefiVoOLGiq0Llbb4hGLaOOMvePb4oQOEO6rXGlTRgoBxV7tGwKqIxkmcLrp DkTA== 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; bh=1Xm9zAeytwpQdH6pfD49hCxo2Ql7Zk4Hr2BjimoqyEA=; b=jxe5h7a7DXalOk90UprpCEJt3/mmbXoixd1J2LHDrrjkwV9fRzHxG/eWVnPluIn0hY CBp0e1xfsi82i4YgBQPbZjLykpeV/+m6kHA5EsIXor76W4UYayQNFN6D4DtXxfyu7A4x koDkREn3s/BHfzOflzhEzmHNc1nz6UIiQbfvHZXe5HvvBaZHHRtMNcsOCevIzBuuzyfQ 2PQyVltEF+C9nGmxTAGVkkxkY+oSPauR8AzBFIxilUzK5YUcAZfQr42YAsjmWPezOooL wZlLnwYPRvoc2dNcR1SGTrQ14YECoTJNHhbPWByKL5uZIdhsJz7ilE+301yrwVuPkYpp PMPw== 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 d9-20020a1709063ec900b00949f51b85f8si4577490ejj.900.2023.04.09.07.26.40; Sun, 09 Apr 2023 07:26:40 -0700 (PDT) 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 9ACE468A59F; Sun, 9 Apr 2023 17:26:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1EE26800AC for ; Sun, 9 Apr 2023 17:26:29 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 88295E0004 for ; Sun, 9 Apr 2023 14:26:28 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Apr 2023 16:26:22 +0200 Message-Id: <20230409142627.19820-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/huffyuvdec: Fix undefined behavior with shift 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: 2DykBOoouFmz Fixes: left shift of negative value -1 Fixes: 57554/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFVHUFF_fuzzer-4853603839115264 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/huffyuvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 7d3515cc889..8ba67bbdeb5 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -695,9 +695,9 @@ static void decode_422_bitstream(HYuvDecContext *s, int count) /* TODO instead of restarting the read when the code isn't in the first level * of the joint table, jump into the 2nd level of the individual table. */ #define READ_2PIX_PLANE16(dst0, dst1, plane){\ - dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\ + dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)*4;\ dst0 += get_bits(&s->gb, 2);\ - dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\ + dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)*4;\ dst1 += get_bits(&s->gb, 2);\ } static void decode_plane_bitstream(HYuvDecContext *s, int width, int plane)