mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugs detected during scanbuild run

Browse Source
This commit is contained in:
Armin Novak 2018-10-17 13:19:33 +02:00
parent 8fe3ac5d26
commit f91590ecbf
3 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libfreerdp/core/gateway/rpc_bind.c
View File

@ -107,25 +107,25 @@ const p_uuid_t BTFN_UUID =
int rpc_send_bind_pdu(rdpRpc* rpc)
{
int status;
BYTE* buffer;
int status = -1;
BYTE* buffer = NULL;
UINT32 offset;
UINT32 length;
RpcClientCall* clientCall;
p_cont_elem_t* p_cont_elem;
rpcconn_bind_hdr_t* bind_pdu;
rpcconn_bind_hdr_t* bind_pdu = NULL;
BOOL promptPassword = FALSE;
rdpSettings* settings = rpc->settings;
freerdp* instance = (freerdp*) settings->instance;
RpcVirtualConnection* connection = rpc->VirtualConnection;
RpcInChannel* inChannel = connection->DefaultInChannel;
const SecBuffer* sbuffer;
const SecBuffer* sbuffer = NULL;
WLog_DBG(TAG, "Sending Bind PDU");
ntlm_free(rpc->ntlm);
rpc->ntlm = ntlm_new();
if (!rpc->ntlm)
return -1;
goto fail;
if ((!settings->GatewayPassword) || (!settings->GatewayUsername)
|| (!strlen(settings->GatewayPassword)) || (!strlen(settings->GatewayUsername)))
@ -153,30 +153,30 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
settings->Password = _strdup(settings->GatewayPassword);
if (!settings->Username || !settings->Domain || settings->Password)
return -1;
goto fail;
}
}
}
if (!ntlm_client_init(rpc->ntlm, FALSE, settings->GatewayUsername, settings->GatewayDomain,
settings->GatewayPassword, NULL))
return -1;
goto fail;
if (!ntlm_client_make_spn(rpc->ntlm, NULL, settings->GatewayHostname))
return -1;
goto fail;
if (!ntlm_authenticate(rpc->ntlm))
return -1;
goto fail;
bind_pdu = (rpcconn_bind_hdr_t*) calloc(1, sizeof(rpcconn_bind_hdr_t));
if (!bind_pdu)
return -1;
goto fail;
sbuffer = ntlm_client_get_output_buffer(rpc->ntlm);
if (!sbuffer)
return -1;
goto fail;
rpc_pdu_header_init(rpc, (rpcconn_hdr_t*) bind_pdu);
bind_pdu->auth_length = (UINT16) sbuffer->cbBuffer;
@ -194,7 +194,7 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
sizeof(p_cont_elem_t));
if (!bind_pdu->p_context_elem.p_cont_elem)
return -1;
goto fail;
p_cont_elem = &bind_pdu->p_context_elem.p_cont_elem[0];
p_cont_elem->p_cont_id = 0;
@ -205,7 +205,7 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
p_cont_elem->transfer_syntaxes = malloc(sizeof(p_syntax_id_t));
if (!p_cont_elem->transfer_syntaxes)
return -1;
goto fail;
CopyMemory(&(p_cont_elem->transfer_syntaxes[0].if_uuid), &NDR_UUID, sizeof(p_uuid_t));
p_cont_elem->transfer_syntaxes[0].if_version = NDR_SYNTAX_IF_VERSION;
@ -218,7 +218,7 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
p_cont_elem->transfer_syntaxes = malloc(sizeof(p_syntax_id_t));
if (!p_cont_elem->transfer_syntaxes)
return -1;
goto fail;
CopyMemory(&(p_cont_elem->transfer_syntaxes[0].if_uuid), &BTFN_UUID, sizeof(p_uuid_t));
p_cont_elem->transfer_syntaxes[0].if_version = BTFN_SYNTAX_IF_VERSION;
@ -233,7 +233,7 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
buffer = (BYTE*) malloc(bind_pdu->frag_length);
if (!buffer)
return -1;
goto fail;
CopyMemory(buffer, bind_pdu, 24);
CopyMemory(&buffer[24], &bind_pdu->p_context_elem, 4);
@ -250,21 +250,28 @@ int rpc_send_bind_pdu(rdpRpc* rpc)
clientCall = rpc_client_call_new(bind_pdu->call_id, 0);
if (!clientCall)
{
free(buffer);
return -1;
}
goto fail;
if (ArrayList_Add(rpc->client->ClientCallList, clientCall) < 0)
{
free(buffer);
return -1;
rpc_client_call_free(clientCall);
goto fail;
}
status = rpc_in_channel_send_pdu(inChannel, buffer, length);
free(bind_pdu->p_context_elem.p_cont_elem[0].transfer_syntaxes);
free(bind_pdu->p_context_elem.p_cont_elem[1].transfer_syntaxes);
free(bind_pdu->p_context_elem.p_cont_elem);
fail:
if (bind_pdu)
{
if (bind_pdu->p_context_elem.p_cont_elem)
{
free(bind_pdu->p_context_elem.p_cont_elem[0].transfer_syntaxes);
free(bind_pdu->p_context_elem.p_cont_elem[1].transfer_syntaxes);
}
free(bind_pdu->p_context_elem.p_cont_elem);
}
free(bind_pdu);
free(buffer);
return (status > 0) ? 1 : -1;
@ -341,7 +348,10 @@ int rpc_send_rpc_auth_3_pdu(rdpRpc* rpc)
sbuffer = ntlm_client_get_output_buffer(rpc->ntlm);
if (!sbuffer)
{
free(auth_3_pdu);
return -1;
}
rpc_pdu_header_init(rpc, (rpcconn_hdr_t*) auth_3_pdu);
auth_3_pdu->auth_length = (UINT16) sbuffer->cbBuffer;

17
libfreerdp/core/gateway/rpc_client.c
View File

@ -883,6 +883,7 @@ BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum)
RpcInChannel* inChannel;
size_t length;
SSIZE_T size;
BOOL rc = FALSE;
if (!s)
return FALSE;
@ -911,11 +912,7 @@ BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum)
length = Stream_Length(s);
if (ntlm_client_query_auth_size(ntlm) < 0)
{
WLog_ERR(TAG, "QueryContextAttributes SECPKG_ATTR_SIZES failure %s [0x%08"PRIX32"]",
GetSecurityStatusString(status), status);
goto fail;
}
request_pdu = (rpcconn_request_hdr_t*) calloc(1, sizeof(rpcconn_request_hdr_t));
@ -941,7 +938,10 @@ BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum)
goto fail;
if (ArrayList_Add(rpc->client->ClientCallList, clientCall) < 0)
{
rpc_client_call_free(clientCall);
goto fail;
}
if (request_pdu->opnum == TsProxySetupReceivePipeOpnum)
rpc->PipeCallId = request_pdu->call_id;
@ -989,22 +989,17 @@ BOOL rpc_client_write_call(rdpRpc* rpc, wStream* s, UINT16 opnum)
CopyMemory(&buffer[offset], Buffers[1].pvBuffer, Buffers[1].cbBuffer);
offset += Buffers[1].cbBuffer;
free(Buffers[1].pvBuffer);
if (rpc_in_channel_send_pdu(inChannel, buffer, request_pdu->frag_length) < 0)
goto fail;
free(request_pdu);
free(buffer);
Stream_Free(s, TRUE);
return TRUE;
rc = TRUE;
fail:
rpc_client_call_free(clientCall);
free(buffer);
free(Buffers[1].pvBuffer);
free(request_pdu);
Stream_Free(s, TRUE);
return FALSE;
return rc;
}
static BOOL rpc_client_resolve_gateway(rdpSettings* settings, char** host, UINT16* port,

2
winpr/tools/makecert/makecert.c
View File

@ -612,7 +612,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa
else if (context->pfxFormat)
ext = "pfx";
else
return -1;
goto out_fail;
sprintf_s(filename, length + 8, "%s.%s", context->output_file, ext);