francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From f489a734d2c06eb4adee654919455799e4cb8c01 Mon Sep 17 00:00:00 2001
|
|
From: akallabeth <akallabeth@posteo.net>
|
|
Date: Sat, 20 Apr 2024 17:59:49 +0200
|
|
Subject: [PATCH] fix offset error
|
|
|
|
CVE: CVE-2024-32658
|
|
Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/1a755d898ddc028cc818d0dd9d49d5acff4c44bf]
|
|
|
|
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
|
---
|
|
libfreerdp/codec/interleaved.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c
|
|
index df148b667..08520e55e 100644
|
|
--- a/libfreerdp/codec/interleaved.c
|
|
+++ b/libfreerdp/codec/interleaved.c
|
|
@@ -212,7 +212,7 @@ static UINT ExtractRunLengthRegularFgBg(const BYTE* pbOrderHdr, const BYTE* pbEn
|
|
runLength = (*pbOrderHdr) & g_MaskRegularRunLength;
|
|
if (runLength == 0)
|
|
{
|
|
- if (!buffer_within_range(pbOrderHdr, 1, pbEnd))
|
|
+ if (!buffer_within_range(pbOrderHdr, 2, pbEnd))
|
|
{
|
|
*advance = 0;
|
|
return 0;
|
|
@@ -282,7 +282,7 @@ static UINT ExtractRunLengthMegaMega(const BYTE* pbOrderHdr, const BYTE* pbEnd,
|
|
WINPR_ASSERT(pbEnd);
|
|
WINPR_ASSERT(advance);
|
|
|
|
- if (!buffer_within_range(pbOrderHdr, 2, pbEnd))
|
|
+ if (!buffer_within_range(pbOrderHdr, 3, pbEnd))
|
|
{
|
|
*advance = 0;
|
|
return 0;
|