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

[mingw] fix type incompatibilities

Browse Source 
The integer types with MINGW do not always match. Ensure the correct
32bit interger base type is used when passing pointers
This commit is contained in:
akallabeth
2025-12-12 18:09:18 +01:00
parent 3faefca351
commit b160ea80e8
9 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/rdpdr/server/rdpdr_main.c
View File

@@ -2341,9 +2341,17 @@ static UINT rdpdr_server_read_file_directory_information(wLog* log, wStream* s,
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, fileNameLength))
return ERROR_INVALID_DATA;
if (fileNameLength / sizeof(WCHAR) > ARRAYSIZE(fdi->FileName))
return ERROR_INVALID_DATA;
#if defined(__MINGW32__)
if (Stream_Read_UTF16_String(s, fdi->FileName, fileNameLength / sizeof(WCHAR)))
return ERROR_INVALID_DATA;
#else
if (Stream_Read_UTF16_String_As_UTF8_Buffer(s, fileNameLength / sizeof(WCHAR), fdi->FileName,
ARRAYSIZE(fdi->FileName)) < 0)
return ERROR_INVALID_DATA;
#endif
return CHANNEL_RC_OK;
}