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

[winpr,stream] fix Stream_Write_UTF16_String return checks

Browse Source
This commit is contained in:
Armin Novak
2026-03-02 17:11:06 +01:00
parent a16e6a632f
commit 8316bca9dd
6 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/rail/client/rail_orders.c
View File

@@ -151,9 +151,10 @@ static UINT rail_read_server_get_appid_resp_order(wStream* s,
return ERROR_INVALID_DATA;
Stream_Read_UINT32(s, getAppidResp->windowId); /* windowId (4 bytes) */
Stream_Read_UTF16_String(
s, getAppidResp->applicationId,
ARRAYSIZE(getAppidResp->applicationId)); /* applicationId (260 UNICODE chars) */
if (!Stream_Read_UTF16_String(
s, getAppidResp->applicationId,
ARRAYSIZE(getAppidResp->applicationId))) /* applicationId (260 UNICODE chars) */
return ERROR_INVALID_DATA;
return CHANNEL_RC_OK;
}

21
channels/rail/server/rail_main.c
View File

@@ -235,9 +235,10 @@ static UINT rail_write_get_app_id_resp_order(wStream* s,
return ERROR_INVALID_PARAMETER;
Stream_Write_UINT32(s, getAppidResp->windowId); /* WindowId (4 bytes) */
Stream_Write_UTF16_String(
s, getAppidResp->applicationId,
ARRAYSIZE(getAppidResp->applicationId)); /* ApplicationId (512 bytes) */
if (!Stream_Write_UTF16_String(
s, getAppidResp->applicationId,
ARRAYSIZE(getAppidResp->applicationId))) /* ApplicationId (512 bytes) */
return ERROR_INVALID_DATA;
return ERROR_SUCCESS;
}
@@ -253,13 +254,15 @@ static UINT rail_write_get_appid_resp_ex_order(wStream* s,
return ERROR_INVALID_PARAMETER;
Stream_Write_UINT32(s, getAppidRespEx->windowID); /* WindowId (4 bytes) */
Stream_Write_UTF16_String(
s, getAppidRespEx->applicationID,
ARRAYSIZE(getAppidRespEx->applicationID)); /* ApplicationId (520 bytes) */
if (!Stream_Write_UTF16_String(
s, getAppidRespEx->applicationID,
ARRAYSIZE(getAppidRespEx->applicationID))) /* ApplicationId (520 bytes) */
return ERROR_INVALID_DATA;
Stream_Write_UINT32(s, getAppidRespEx->processId); /* ProcessId (4 bytes) */
Stream_Write_UTF16_String(
s, getAppidRespEx->processImageName,
ARRAYSIZE(getAppidRespEx->processImageName)); /* ProcessImageName (520 bytes) */
if (!Stream_Write_UTF16_String(
s, getAppidRespEx->processImageName,
ARRAYSIZE(getAppidRespEx->processImageName))) /* ProcessImageName (520 bytes) */
return ERROR_INVALID_DATA;
return ERROR_SUCCESS;
}