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

Websocket checks (#11059)

Browse Source
This commit is contained in:
akallabeth
2025-01-10 10:53:27 +01:00
committed by GitHub
parent 0966947f9f
commit c7c207b026
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libfreerdp/core/gateway/websocket.c
View File

@@ -354,7 +354,7 @@ static int websocket_handle_payload(BIO* bio, BYTE* pBuffer, size_t size,
int websocket_context_read(websocket_context* encodingContext, BIO* bio, BYTE* pBuffer, size_t size)
{
int status = 0;
int effectiveDataLen = 0;
size_t effectiveDataLen = 0;
WINPR_ASSERT(bio);
WINPR_ASSERT(pBuffer);
@@ -371,7 +371,8 @@ int websocket_context_read(websocket_context* encodingContext, BIO* bio, BYTE* p
ERR_clear_error();
status = BIO_read(bio, (char*)buffer, sizeof(buffer));
if (status <= 0)
return (effectiveDataLen > 0 ? effectiveDataLen : status);
return (effectiveDataLen > 0 ? WINPR_ASSERTING_INT_CAST(int, effectiveDataLen)
: status);
encodingContext->opcode = buffer[0];
if (((encodingContext->opcode & 0xf) != WebsocketContinuationOpcode) &&
@@ -387,7 +388,8 @@ int websocket_context_read(websocket_context* encodingContext, BIO* bio, BYTE* p
ERR_clear_error();
status = BIO_read(bio, (char*)buffer, sizeof(buffer));
if (status <= 0)
return (effectiveDataLen > 0 ? effectiveDataLen : status);
return (effectiveDataLen > 0 ? WINPR_ASSERTING_INT_CAST(int, effectiveDataLen)
: status);
encodingContext->masking = ((buffer[0] & WEBSOCKET_MASK_BIT) == WEBSOCKET_MASK_BIT);
encodingContext->lengthAndMaskPosition = 0;
@@ -416,11 +418,15 @@ int websocket_context_read(websocket_context* encodingContext, BIO* bio, BYTE* p
ERR_clear_error();
status = BIO_read(bio, (char*)buffer, sizeof(buffer));
if (status <= 0)
return (effectiveDataLen > 0 ? effectiveDataLen : status);
return (effectiveDataLen > 0
? WINPR_ASSERTING_INT_CAST(int, effectiveDataLen)
: status);
if (status > UINT8_MAX)
return -1;
encodingContext->payloadLength =
(encodingContext->payloadLength) << 8 | buffer[0];
encodingContext->lengthAndMaskPosition += status;
encodingContext->lengthAndMaskPosition +=
WINPR_ASSERTING_INT_CAST(BYTE, status);
}
encodingContext->state =
(encodingContext->masking ? WebSocketStateMaskingKey : WebSocketStatePayload);
@@ -436,12 +442,13 @@ int websocket_context_read(websocket_context* encodingContext, BIO* bio, BYTE* p
{
status = websocket_handle_payload(bio, pBuffer, size, encodingContext);
if (status < 0)
return (effectiveDataLen > 0 ? effectiveDataLen : status);
return (effectiveDataLen > 0 ? WINPR_ASSERTING_INT_CAST(int, effectiveDataLen)
: status);
effectiveDataLen += status;
effectiveDataLen += WINPR_ASSERTING_INT_CAST(size_t, status);
if ((size_t)status >= size)
return effectiveDataLen;
if (WINPR_ASSERTING_INT_CAST(size_t, status) >= size)
return WINPR_ASSERTING_INT_CAST(int, effectiveDataLen);
pBuffer += status;
size -= WINPR_ASSERTING_INT_CAST(size_t, status);
}

1
winpr/libwinpr/sspi/Kerberos/kerberos.c
View File

@@ -1979,7 +1979,6 @@ static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(PCtxtHandle phContext,
iov[3].data.data = &data2[iov[2].data.length];
char* data3 = iov[3].data.data;
iov[4].data.data = &data2[iov[3].data.length];
iov[4].data.data = &data3[iov[3].data.length];
if (krb_log_exec(krb5glue_decrypt_iov, creds->ctx, key, usage, iov, ARRAYSIZE(iov)))