From patchwork Sat Aug 1 13:46:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21426 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7C0CA44B9AE for ; Sat, 1 Aug 2020 16:47:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5372A68BA3C; Sat, 1 Aug 2020 16:47:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D04D68B4B2 for ; Sat, 1 Aug 2020 16:47:20 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id o18so9800436eds.10 for ; Sat, 01 Aug 2020 06:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4iDtA+Ls9PIRAmst45DGipxATzL3bxkm8hgPrGyMMEY=; b=oiik+bOgPmwGDe4a7qCulWOvNZPLXCeMM5MkJ+BVr1XC1JxPuUi0Lt6969UsSr/OQT VqYccYTQQoHbkO5oDBryG/qRbBVfkZTPry6Pf+pTyI7kBXBGYxgxR/YU9oGhQpoP0qqH Ohjwe1nCLiCvJ4Sx/BXeVI7hh5UBvPcw/+4O95E+znuRdtO3xYKKLLoo1bs3+XCl1FEc 4m8/p9l8CjS9Cg6zHwCUkp5PH0vzNYARqgoivkKPO+gHmE9RhWU9YF65Hzyvy74ZGUZN Si0njWr+sux+kE163L3AYSOwnNmqMDi5KvrUSaFKJ6peV1BbtI8dDdale5cc/zlR7Aws sWng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4iDtA+Ls9PIRAmst45DGipxATzL3bxkm8hgPrGyMMEY=; b=X+xeyxko2Gy9IAw0wfRRhMGou3BSZHLIVXH67GsQ5RNElhG3HL1oVeL7wmA1Tr+SpF eOs7BVWkYhpST+udl8P8Bhq1hnXnH9gxJE2rA0JX1EKUOIE880Xvgx8m9jyqanX6f2zz 2p7vfBJfSYKqOa5H6HndObz3nuIqj70+W0V2Xe6OrB38zL5FYO3uIGWSYVWNIERGDUGN mMaHIsFS8XAO1TLwtwzHvxRoocq3mYkPh3ViI8v7qE8XUzFYPonHeATXPOvgoVG8UWNu RunhFcszk5vmOJ4ywHG9pAKnyOWuVJO9VGoLw7kJWireVVF2CjT0yLx8+IZE36n7uYIe xm1g== X-Gm-Message-State: AOAM531omiqBVRKwfadYQ9Vc2KQnBFeywpYV3m4fWFU92ATy262BpF/G iw7P1cO6Vd844ACUX2H0EtlEPXXK X-Google-Smtp-Source: ABdhPJztDWjE4/QnVX6lgD1RXAKMwSW1gS0h58Bl8YnZcwAtboS/s+xFH/VKpQxlWfEvzTbsjUrOdw== X-Received: by 2002:aa7:da0e:: with SMTP id r14mr8466690eds.236.1596289639562; Sat, 01 Aug 2020 06:47:19 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id b24sm12178501edn.33.2020.08.01.06.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 06:47:18 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 15:46:52 +0200 Message-Id: <20200801134704.3647-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> References: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/21] avcodec/smacker: Use unsigned for shift 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Given that the code currently accepts only 27 bits long Huffman codes, the shift 1 << (length - 1) with length in 1..28 that is performed when parsing the tree is safe. Yet if this limit were ever expanded to the full 32 bits, this shift would be potentially undefined. So simply use unsigned. Signed-off-by: Andreas Rheinhardt --- libavcodec/smacker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 9ba70af6f7..e6b163722a 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -121,7 +121,7 @@ static int smacker_decode_tree(GetBitContext *gb, HuffContext *hc, uint32_t pref r = smacker_decode_tree(gb, hc, prefix, length); if(r) return r; - return smacker_decode_tree(gb, hc, prefix | (1 << (length - 1)), length); + return smacker_decode_tree(gb, hc, prefix | (1U << (length - 1)), length); } }