From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C022148FC2 for ; Tue, 30 Jan 2024 22:16:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30E9668CACA; Wed, 31 Jan 2024 00:16:14 +0200 (EET) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BB2068C353 for ; Wed, 31 Jan 2024 00:16:07 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d71cb97937so26332345ad.3 for ; Tue, 30 Jan 2024 14:16:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706652965; x=1707257765; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Or+rYDPzP7QgWx2Rq7zZVZ68/8HYzR/4BVH0HSOO7iQ=; b=NDfEAzESAp6GXYj8i8X3NMaXo2uVU9BWZTVWxtP+NCU1bNKfpBcwj0jaTKgQ/ZFsU3 qQNU8NcYQSga+SHLKSgGMGarfL37ZSsHywyyEanRyT07yx4fYgvbqD03s1zo2UIHJ2Ih D9C03M6zUkoPmh802KCX9sCfezdLwESovvpMQfStoNTbUQmlcpN5N5MegmET3Klq/d11 LnKqCkFa+cRtTB0pbxmRJZfgKfs++wQ2xiIqOFTm9IHTEpeKznkt1itYjbqpFmvpPEdf Ekx0QuryR2fA31sTOVhhoG6OFL+5osFCfBN9kRHl9Qw9LjLBImw7f5LyTlut66Yw8c7R YZEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706652965; x=1707257765; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Or+rYDPzP7QgWx2Rq7zZVZ68/8HYzR/4BVH0HSOO7iQ=; b=fjSnWKlbtDDMDKNIOg0qR1vh8sF8JvTOrMy2uSXw27gHIwdmWPOeoU1bKtcPWhnP/d HKE5Fuvz2XMuckeTsEfJR7BwKDKeD7doVKC1Kpc4syG/zO71Ncoj/OZB3pPCDLL69yy2 wXmIjUriHDOB0FRNUpTzn0x5yC2NFmJGK968L6zrtgsrFlTJJZzJQOguF5ZBf1ksERnt /4XECz3E1JtpBbJSKb1tqQUcbQPxk8+S9qJI4wUyahCB0fwFmSArD3JsNnH1mAW/XGMc LIUCWRfMX3HCCNYeWfb+LRz9w5gtNZf6v7+3asBG40GmvztSW/qV4VjH8bbzltpjxiST 43Jg== X-Gm-Message-State: AOJu0YxN3ft/M5ggT5K3b4TZPz4539UQ8p57exYXEFHbopErAc/uBcv7 3xmrohG/TRLKyDM/ZpQtCdhavG0IQGRK14ja5AS2pVvxWH5a2gOODwwQWn2f X-Google-Smtp-Source: AGHT+IG4Eb49Hci5Cf8zJDFd6TlgMuBKfITBYrdTal4IREwjjY88+G5DjpDVaxsTIRsdtXeNPujq7A== X-Received: by 2002:a17:902:b182:b0:1d8:ffc2:f6d5 with SMTP id s2-20020a170902b18200b001d8ffc2f6d5mr620556plr.51.1706652964881; Tue, 30 Jan 2024 14:16:04 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ko3-20020a17090307c300b001d77c28ae9dsm7766631plb.17.2024.01.30.14.16.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 14:16:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 19:16:12 -0300 Message-ID: <20240130221612.970-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/get_bits: don't shift more bits than available in an unsigned with get_leb() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/get_bits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 9e19d2a439..c0cc7c0a7d 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -725,7 +725,7 @@ static inline unsigned get_leb(GetBitContext *s) { int byte = get_bits(s, 8); unsigned bits = byte & 0x7f; more = byte & 0x80; - if (i <= 4) + if (i <= 3 || (i == 4 && bits < (1 << 4))) leb |= bits << (i * 7); if (++i == 8) break; -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".