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

Merge pull request #12116 from akallabeth/cov-fix

Browse Source 
Coverity warning fixes
This commit is contained in:
akallabeth
2026-01-09 12:12:27 +01:00
committed by GitHub
parent 88ea351a27 720de91336
commit 66aada8928
2 changed files with 31 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
libfreerdp/core/gateway/http.c
View File

@@ -774,11 +774,9 @@ fail:
static BOOL http_response_parse_header_field(HttpResponse* response, const char* name,
const char* value)
{
BOOL status = TRUE;
WINPR_ASSERT(response);
if (!name)
if (!name || !value)
return FALSE;
if (_stricmp(name, "Content-Length") == 0)
@@ -791,18 +789,18 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char*
return FALSE;
response->ContentLength = WINPR_ASSERTING_INT_CAST(size_t, val);
return TRUE;
}
else if (_stricmp(name, "Content-Type") == 0)
if (_stricmp(name, "Content-Type") == 0)
{
if (!value)
return FALSE;
free(response->ContentType);
response->ContentType = _strdup(value);
if (!response->ContentType)
return FALSE;
return response->ContentType != NULL;
}
else if (_stricmp(name, "Transfer-Encoding") == 0)
if (_stricmp(name, "Transfer-Encoding") == 0)
{
if (_stricmp(value, "identity") == 0)
response->TransferEncoding = TransferEncodingIdentity;
@@ -810,33 +808,31 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char*
response->TransferEncoding = TransferEncodingChunked;
else
response->TransferEncoding = TransferEncodingUnknown;
return TRUE;
}
else if (_stricmp(name, "Sec-WebSocket-Version") == 0)
if (_stricmp(name, "Sec-WebSocket-Version") == 0)
{
if (!value)
return FALSE;
free(response->SecWebsocketVersion);
response->SecWebsocketVersion = _strdup(value);
if (!response->SecWebsocketVersion)
return FALSE;
return response->SecWebsocketVersion != NULL;
}
else if (_stricmp(name, "Sec-WebSocket-Accept") == 0)
if (_stricmp(name, "Sec-WebSocket-Accept") == 0)
{
if (!value)
return FALSE;
free(response->SecWebsocketAccept);
response->SecWebsocketAccept = _strdup(value);
if (!response->SecWebsocketAccept)
return FALSE;
return response->SecWebsocketAccept != NULL;
}
else if (_stricmp(name, "WWW-Authenticate") == 0)
if (_stricmp(name, "WWW-Authenticate") == 0)
{
char* separator = NULL;
const char* authScheme = NULL;
char* authValue = NULL;
separator = strchr(value, ' ');
const char* authScheme = value;
const char* authValue = "";
char* separator = strchr(value, ' ');
if (separator)
{
@@ -847,30 +843,18 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char*
* opaque="5ccc069c403ebaf9f0171e9517f40e41"
*/
*separator = '\0';
authScheme = value;
authValue = separator + 1;
if (!authScheme || !authValue)
if (!authValue)
return FALSE;
}
else
{
authScheme = value;
if (!authScheme)
return FALSE;
authValue = "";
}
status = HashTable_Insert(response->Authenticates, authScheme, authValue);
return HashTable_Insert(response->Authenticates, authScheme, authValue);
}
else if (_stricmp(name, "Set-Cookie") == 0)
if (_stricmp(name, "Set-Cookie") == 0)
{
char* separator = NULL;
const char* CookieName = NULL;
char* CookieValue = NULL;
separator = strchr(value, '=');
char* separator = strchr(value, '=');
if (separator)
{
@@ -879,8 +863,8 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char*
* Set-Cookie: name="value with spaces"; Attribute=value
*/
*separator = '\0';
CookieName = value;
CookieValue = separator + 1;
const char* CookieName = value;
char* CookieValue = separator + 1;
if (!CookieName || !CookieValue)
return FALSE;
@@ -905,16 +889,11 @@ static BOOL http_response_parse_header_field(HttpResponse* response, const char*
}
*p = '\0';
}
return HashTable_Insert(response->SetCookie, CookieName, CookieValue);
}
else
{
return FALSE;
}
status = HashTable_Insert(response->SetCookie, CookieName, CookieValue);
}
return status;
return FALSE;
}
static BOOL http_response_parse_header(HttpResponse* response)

3
libfreerdp/core/tcp.c
View File

@@ -1164,7 +1164,6 @@ static int get_next_addrinfo(rdpContext* context, struct addrinfo* input, struct
fail:
freerdp_set_last_error_if_not(context, errorCode);
freeaddrinfo(input);
*result = NULL;
return -1;
}
@@ -1195,6 +1194,7 @@ static int freerdp_vsock_connect(rdpContext* context, const char* hostname, int
char ebuffer[256] = { 0 };
WLog_ERR(TAG, "could not extract port from '%s', value=%ul, error=%s", hostname, val,
winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
close(sockfd);
return -1;
}
addr.svm_cid = WINPR_ASSERTING_INT_CAST(typeof(addr.svm_cid), val);
@@ -1205,6 +1205,7 @@ static int freerdp_vsock_connect(rdpContext* context, const char* hostname, int
if ((connect(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_vm))) == -1)
{
WLog_ERR(TAG, "failed to connect to %s", hostname);
close(sockfd);
return -1;
}
return sockfd;