Merge pull request #10254 from akallabeth/cov_warn_fix

Cov warn fix
This commit is contained in:
akallabeth
2024-06-05 15:45:59 +02:00
committed by GitHub
3 changed files with 11 additions and 3 deletions

View File

@@ -9,7 +9,7 @@ on:
permissions:
pull-requests: write
issues: write
repository: read
checks: write
jobs:
build:

View File

@@ -1456,7 +1456,10 @@ freerdp_peer* freerdp_peer_new(int sockfd)
option_len = sizeof(option_value);
if (sockfd >= 0)
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (void*)&option_value, option_len);
{
if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (void*)&option_value, option_len) < 0)
goto fail;
}
if (client)
{
@@ -1487,6 +1490,10 @@ freerdp_peer* freerdp_peer_new(int sockfd)
}
return client;
fail:
freerdp_peer_free(client);
return NULL;
}
void freerdp_peer_free(freerdp_peer* client)

View File

@@ -306,7 +306,8 @@ void proxy_read_environment(rdpSettings* settings, char* envname)
WLog_INFO(TAG, "deactivating proxy: %s [%s=%s]",
freerdp_settings_get_string(settings, FreeRDP_ServerHostname), envname,
env);
freerdp_settings_set_uint32(settings, FreeRDP_ProxyType, PROXY_TYPE_NONE);
if (!freerdp_settings_set_uint32(settings, FreeRDP_ProxyType, PROXY_TYPE_NONE))
WLog_WARN(TAG, "failed to set FreeRDP_ProxyType=PROXY_TYPE_NONE");
}
}
else