morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11527 from hardening/serverside_multimn_fix

Browse Source 
gcc: fix server-side connection with multiple monitor
This commit is contained in:
akallabeth
2025-04-23 14:49:46 +02:00
committed by GitHub
parent ab8deea11e 801c3fdda3
commit e54781b028
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/core/gcc.c
View File

@@ -1445,7 +1445,7 @@ BOOL gcc_write_client_core_data(wStream* s, const rdpMcs* mcs)
if (!gcc_write_user_data_header(s, CS_CORE, 234))
return FALSE;
Stream_Write_UINT32(s, settings->RdpVersion); /* Version */
Stream_Write_UINT32(s, settings->RdpVersion); /* Version */
Stream_Write_UINT16(
s, WINPR_ASSERTING_INT_CAST(uint16_t, settings->DesktopWidth)); /* DesktopWidth */
Stream_Write_UINT16(
@@ -2170,7 +2170,7 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs)
const INT32 bottom = Stream_Get_INT32(s); /* bottom */
const UINT32 flags = Stream_Get_UINT32(s); /* flags */
if ((left > right) || (bottom > top))
if ((left > right) || (top > bottom))
return FALSE;
const INT64 w = right - left;
@@ -2242,11 +2242,11 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
"Monitor[%" PRIu32 "]: top=%" PRId32 ", left=%" PRId32 ", bottom=%" PRId32
", right=%" PRId32 ", flags=%" PRIu32,
i, top, left, bottom, right, flags);
Stream_Write_INT32(s, left); /* left */
Stream_Write_INT32(s, top); /* top */
Stream_Write_INT32(s, right); /* right */
Stream_Write_INT32(s, bottom); /* bottom */
Stream_Write_UINT32(s, flags); /* flags */
Stream_Write_INT32(s, left); /* left */
Stream_Write_INT32(s, top); /* top */
Stream_Write_INT32(s, right); /* right */
Stream_Write_INT32(s, bottom); /* bottom */
Stream_Write_UINT32(s, flags); /* flags */
}
}
WLog_DBG(TAG, "FINISHED");