41b92eb28a
It fixes CVE-2026-64624, CVE-2026-67289, CVE-2026-67299 and CVE-2026-68580. Resolves: RHEL-213171, RHEL-222788, RHEL-223001, RHEL-223611 Co-authored-by: Ondrej Holy <oholy@redhat.com>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 9397fbeed4b2862ae68f9556950af415163c9398 Mon Sep 17 00:00:00 2001
|
|
From: Armin Novak <armin.novak@thincast.com>
|
|
Date: Tue, 7 Jul 2026 12:58:11 +0200
|
|
Subject: [PATCH] [core,message] fix update_message_WindowIcon
|
|
|
|
---
|
|
libfreerdp/core/message.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libfreerdp/core/message.c b/libfreerdp/core/message.c
|
|
index 7af29e94d..1ab0d4e4e 100644
|
|
--- a/libfreerdp/core/message.c
|
|
+++ b/libfreerdp/core/message.c
|
|
@@ -1147,18 +1147,21 @@ static BOOL update_message_WindowIcon(rdpContext* context, const WINDOW_ORDER_IN
|
|
if (!wParam)
|
|
return FALSE;
|
|
|
|
- CopyMemory(wParam, orderInfo, sizeof(WINDOW_ORDER_INFO));
|
|
+ *wParam = *orderInfo;
|
|
+
|
|
lParam = (WINDOW_ICON_ORDER*)calloc(1, sizeof(WINDOW_ICON_ORDER));
|
|
|
|
if (!lParam)
|
|
goto out_fail;
|
|
|
|
+ *lParam = *windowIcon;
|
|
lParam->iconInfo = calloc(1, sizeof(ICON_INFO));
|
|
|
|
if (!lParam->iconInfo)
|
|
goto out_fail;
|
|
|
|
- CopyMemory(lParam, windowIcon, sizeof(WINDOW_ICON_ORDER));
|
|
+ *lParam->iconInfo = *windowIcon->iconInfo;
|
|
+
|
|
WLog_VRB(TAG, "update_message_WindowIcon");
|
|
|
|
if (windowIcon->iconInfo->cbBitsColor > 0)
|