mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
Merge pull request #12405 from akallabeth/winpr-set-length
[winpr,stream] Check Stream_SetLength return
This commit is contained in:
@@ -478,7 +478,9 @@ static UINT ainput_process_message(ainput_server* ainput)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, ActualBytesReturned);
|
||||
if (!Stream_SetLength(s, ActualBytesReturned))
|
||||
goto out;
|
||||
|
||||
{
|
||||
const UINT16 MessageId = Stream_Get_UINT16(s);
|
||||
|
||||
|
||||
@@ -400,7 +400,12 @@ static DWORD WINAPI audin_server_thread_func(LPVOID arg)
|
||||
break;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
{
|
||||
error = ERROR_INTERNAL_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLengthWLog(audin->log, s, SNDIN_HEADER_SIZE))
|
||||
{
|
||||
error = ERROR_INTERNAL_ERROR;
|
||||
|
||||
@@ -322,7 +322,9 @@ static UINT disp_server_handle_messages(DispServerContext* context)
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
|
||||
Stream_ResetPosition(s);
|
||||
|
||||
while (Stream_GetPosition(s) < Stream_Length(s))
|
||||
|
||||
@@ -252,7 +252,9 @@ static UINT gfxredir_server_handle_messages(GfxRedirServerContext* context)
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
|
||||
Stream_ResetPosition(s);
|
||||
|
||||
while (Stream_GetPosition(s) < Stream_Length(s))
|
||||
|
||||
@@ -348,7 +348,9 @@ static UINT location_process_message(location_server* location)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
goto out;
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLength(TAG, s, LOCATION_HEADER_SIZE))
|
||||
return ERROR_NO_DATA;
|
||||
|
||||
|
||||
@@ -2250,7 +2250,11 @@ static DWORD WINAPI rdpdr_server_thread(LPVOID arg)
|
||||
if (BytesReturned >= RDPDR_HEADER_LENGTH)
|
||||
{
|
||||
Stream_ResetPosition(s);
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
{
|
||||
error = ERROR_INTERNAL_ERROR;
|
||||
goto out_stream;
|
||||
}
|
||||
|
||||
while (Stream_GetRemainingLength(s) >= RDPDR_HEADER_LENGTH)
|
||||
{
|
||||
|
||||
@@ -298,7 +298,9 @@ static UINT enumerator_process_message(enumerator_server* enumerator)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLength(TAG, s, CAM_HEADER_SIZE))
|
||||
return ERROR_NO_DATA;
|
||||
|
||||
|
||||
@@ -504,7 +504,9 @@ static UINT device_process_message(device_server* device)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
goto out;
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLength(TAG, s, CAM_HEADER_SIZE))
|
||||
return ERROR_NO_DATA;
|
||||
|
||||
|
||||
@@ -271,7 +271,9 @@ static UINT mouse_cursor_process_message(mouse_cursor_server* mouse_cursor)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
goto out;
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLength(TAG, s, RDPEMSC_HEADER_SIZE))
|
||||
return ERROR_NO_DATA;
|
||||
|
||||
|
||||
@@ -1869,7 +1869,9 @@ UINT rdpgfx_server_handle_messages(RdpgfxServerContext* context)
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
return ERROR_INTERNAL_ERROR;
|
||||
|
||||
Stream_ResetPosition(s);
|
||||
|
||||
while (Stream_GetPosition(s) < Stream_Length(s))
|
||||
|
||||
@@ -181,7 +181,9 @@ static UINT telemetry_process_message(telemetry_server* telemetry)
|
||||
goto out;
|
||||
}
|
||||
|
||||
Stream_SetLength(s, BytesReturned);
|
||||
if (!Stream_SetLength(s, BytesReturned))
|
||||
goto out;
|
||||
|
||||
if (!Stream_CheckAndLogRequiredLength(TAG, s, 2))
|
||||
return ERROR_NO_DATA;
|
||||
|
||||
|
||||
@@ -287,7 +287,9 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context,
|
||||
error =
|
||||
soxr_process(context->sox, src, sframes, &idone, Stream_Buffer(context->common.resample),
|
||||
Stream_Capacity(context->common.resample) / rbytes, &odone);
|
||||
Stream_SetLength(context->common.resample, odone * rbytes);
|
||||
if (!Stream_SetLength(context->common.resample, odone * rbytes))
|
||||
return FALSE;
|
||||
|
||||
*data = Stream_Buffer(context->common.resample);
|
||||
*length = Stream_Length(context->common.resample);
|
||||
return (error == 0) != 0;
|
||||
|
||||
@@ -268,7 +268,11 @@ BOOL freerdp_connect(freerdp* instance)
|
||||
record.data = Stream_Buffer(s);
|
||||
if (!pcap_get_next_record_content(update->pcap_rfx, &record))
|
||||
break;
|
||||
Stream_SetLength(s, record.length);
|
||||
if (!Stream_SetLength(s, record.length))
|
||||
{
|
||||
status = FALSE;
|
||||
continue;
|
||||
}
|
||||
Stream_ResetPosition(s);
|
||||
|
||||
if (!update_begin_paint(&update->common))
|
||||
|
||||
@@ -430,30 +430,26 @@ static wStream* rdg_receive_packet(rdpRdg* rdg)
|
||||
return nullptr;
|
||||
|
||||
if (!rdg_read_all(rdg->context, rdg->tlsOut, Stream_Buffer(s), header, &rdg->transferEncoding))
|
||||
{
|
||||
Stream_Free(s, TRUE);
|
||||
return nullptr;
|
||||
}
|
||||
goto fail;
|
||||
|
||||
Stream_Seek(s, 4);
|
||||
Stream_Read_UINT32(s, packetLength);
|
||||
|
||||
if ((packetLength > INT_MAX) || !Stream_EnsureCapacity(s, packetLength) ||
|
||||
(packetLength < header))
|
||||
{
|
||||
Stream_Free(s, TRUE);
|
||||
return nullptr;
|
||||
}
|
||||
goto fail;
|
||||
|
||||
if (!rdg_read_all(rdg->context, rdg->tlsOut, Stream_Buffer(s) + header, packetLength - header,
|
||||
&rdg->transferEncoding))
|
||||
{
|
||||
Stream_Free(s, TRUE);
|
||||
return nullptr;
|
||||
}
|
||||
goto fail;
|
||||
|
||||
Stream_SetLength(s, packetLength);
|
||||
if (!Stream_SetLength(s, packetLength))
|
||||
goto fail;
|
||||
return s;
|
||||
|
||||
fail:
|
||||
Stream_Free(s, TRUE);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static BOOL rdg_send_handshake(rdpRdg* rdg)
|
||||
|
||||
@@ -88,33 +88,15 @@ static const char* rpc_client_state_str(RPC_CLIENT_STATE state)
|
||||
return str;
|
||||
}
|
||||
|
||||
static void rpc_pdu_reset(RPC_PDU* pdu)
|
||||
WINPR_ATTR_NODISCARD
|
||||
static BOOL rpc_pdu_reset(RPC_PDU* pdu)
|
||||
{
|
||||
WINPR_ASSERT(pdu);
|
||||
pdu->Type = 0;
|
||||
pdu->Flags = 0;
|
||||
pdu->CallId = 0;
|
||||
Stream_ResetPosition(pdu->s);
|
||||
Stream_SetLength(pdu->s, 0);
|
||||
}
|
||||
|
||||
static RPC_PDU* rpc_pdu_new(void)
|
||||
{
|
||||
RPC_PDU* pdu = nullptr;
|
||||
pdu = (RPC_PDU*)malloc(sizeof(RPC_PDU));
|
||||
|
||||
if (!pdu)
|
||||
return nullptr;
|
||||
|
||||
pdu->s = Stream_New(nullptr, 4096);
|
||||
|
||||
if (!pdu->s)
|
||||
{
|
||||
free(pdu);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
rpc_pdu_reset(pdu);
|
||||
return pdu;
|
||||
return Stream_SetLength(pdu->s, 0);
|
||||
}
|
||||
|
||||
static void rpc_pdu_free(RPC_PDU* pdu)
|
||||
@@ -126,6 +108,29 @@ static void rpc_pdu_free(RPC_PDU* pdu)
|
||||
free(pdu);
|
||||
}
|
||||
|
||||
WINPR_ATTR_MALLOC(rpc_pdu_free, 1)
|
||||
static RPC_PDU* rpc_pdu_new(void)
|
||||
{
|
||||
RPC_PDU* pdu = (RPC_PDU*)calloc(1, sizeof(RPC_PDU));
|
||||
|
||||
if (!pdu)
|
||||
return nullptr;
|
||||
|
||||
pdu->s = Stream_New(nullptr, 4096);
|
||||
|
||||
if (!pdu->s)
|
||||
goto fail;
|
||||
|
||||
if (!rpc_pdu_reset(pdu))
|
||||
goto fail;
|
||||
|
||||
return pdu;
|
||||
|
||||
fail:
|
||||
rpc_pdu_free(pdu);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static int rpc_client_receive_pipe_write(RpcClient* client, const BYTE* buffer, size_t length)
|
||||
{
|
||||
int status = 0;
|
||||
@@ -477,7 +482,8 @@ static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment)
|
||||
|
||||
if (rpc_client_recv_pdu(rpc, pdu) < 0)
|
||||
goto fail;
|
||||
rpc_pdu_reset(pdu);
|
||||
if (!rpc_pdu_reset(pdu))
|
||||
goto fail;
|
||||
rpc->StubFragCount = 0;
|
||||
rpc->StubCallId = 0;
|
||||
}
|
||||
@@ -517,7 +523,8 @@ static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment)
|
||||
if (rpc_client_recv_pdu(rpc, pdu) < 0)
|
||||
goto fail;
|
||||
|
||||
rpc_pdu_reset(pdu);
|
||||
if (!rpc_pdu_reset(pdu))
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -543,7 +550,8 @@ static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment)
|
||||
if (rpc_client_recv_pdu(rpc, pdu) < 0)
|
||||
goto fail;
|
||||
|
||||
rpc_pdu_reset(pdu);
|
||||
if (!rpc_pdu_reset(pdu))
|
||||
goto fail;
|
||||
goto success;
|
||||
}
|
||||
else if (header.common.ptype == PTYPE_FAULT)
|
||||
|
||||
@@ -1551,7 +1551,9 @@ BOOL rdp_decrypt(rdpRdp* rdp, wStream* s, UINT16* pLength, UINT16 securityFlags)
|
||||
if (!security_fips_check_signature(Stream_ConstPointer(s), (size_t)padLength, sig, 8, rdp))
|
||||
goto unlock;
|
||||
|
||||
Stream_SetLength(s, Stream_Length(s) - pad);
|
||||
if (!Stream_SetLength(s, Stream_Length(s) - pad))
|
||||
goto unlock;
|
||||
|
||||
*pLength = (UINT16)padLength;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -48,7 +48,8 @@ static BOOL test_entry_read_write(void)
|
||||
if (winpr_RAND(Stream_Buffer(sw), Stream_Capacity(sw)) < 0)
|
||||
goto fail;
|
||||
entrysize += Stream_Capacity(sw);
|
||||
Stream_SetLength(sw, Stream_Capacity(sw));
|
||||
if (!Stream_SetLength(sw, Stream_Capacity(sw)))
|
||||
goto fail;
|
||||
|
||||
fp = fopen(name, "wb");
|
||||
if (!fp)
|
||||
|
||||
@@ -279,7 +279,8 @@ static vgidsEF* vgids_ef_new(vgidsContext* ctx, USHORT id)
|
||||
WLog_ERR(TAG, "Failed to create file data stream");
|
||||
goto create_failed;
|
||||
}
|
||||
Stream_SetLength(ef->data, 0);
|
||||
if (!Stream_SetLength(ef->data, 0))
|
||||
goto create_failed;
|
||||
|
||||
if (!ArrayList_Append(ctx->files, ef))
|
||||
{
|
||||
@@ -1129,7 +1130,9 @@ static BOOL vgids_perform_digital_signature(vgidsContext* context)
|
||||
goto sign_failed;
|
||||
}
|
||||
|
||||
Stream_SetLength(context->responseData, sigSize);
|
||||
if (!Stream_SetLength(context->responseData, sigSize))
|
||||
goto sign_failed;
|
||||
|
||||
EVP_PKEY_CTX_free(ctx);
|
||||
break;
|
||||
}
|
||||
@@ -1204,9 +1207,8 @@ static BOOL vgids_perform_decrypt(vgidsContext* context)
|
||||
goto decrypt_failed;
|
||||
}
|
||||
|
||||
Stream_SetLength(context->responseData, outlen);
|
||||
rc = Stream_SetLength(context->responseData, outlen);
|
||||
}
|
||||
rc = TRUE;
|
||||
|
||||
decrypt_failed:
|
||||
EVP_PKEY_CTX_free(ctx);
|
||||
|
||||
@@ -1743,7 +1743,11 @@ static void* stream_copy(const void* obj)
|
||||
if (!dst)
|
||||
return nullptr;
|
||||
memcpy(Stream_Buffer(dst), Stream_ConstBuffer(src), Stream_Capacity(dst));
|
||||
Stream_SetLength(dst, Stream_Length(src));
|
||||
if (!Stream_SetLength(dst, Stream_Length(src)))
|
||||
{
|
||||
Stream_Free(dst, TRUE);
|
||||
return nullptr;
|
||||
}
|
||||
Stream_SetPosition(dst, Stream_GetPosition(src));
|
||||
return dst;
|
||||
}
|
||||
|
||||
@@ -247,7 +247,8 @@ wStream* StreamPool_Take(wStreamPool* pool, size_t size)
|
||||
else if (s)
|
||||
{
|
||||
Stream_ResetPosition(s);
|
||||
Stream_SetLength(s, Stream_Capacity(s));
|
||||
if (!Stream_SetLength(s, Stream_Capacity(s)))
|
||||
goto out_fail;
|
||||
StreamPool_ShiftAvailable(pool, foundIndex);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user