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

Fixes from tests (#7308)

Browse Source 
* Fixed memory leak in tls_verify_certificate

* Fixed missing NULL checks

* Fixed missing checks for FreeRDP_DeactivateClientDecoding

* Added WINPR_ASSERT for client common new/free

* Added /disable-output switch to deactivate client decoding

Allows low resource remote connections that do not require visual
feedback. (e.g. load testing/...)
This commit is contained in:
akallabeth 2021-09-21 09:56:56 +02:00 committed by GitHub
parent 7b7e2d6f32
commit 1c84690c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/common/client.c
View File

@ -38,13 +38,25 @@
static BOOL freerdp_client_common_new(freerdp* instance, rdpContext* context)
{
RDP_CLIENT_ENTRY_POINTS* pEntryPoints = instance->pClientEntryPoints;
RDP_CLIENT_ENTRY_POINTS* pEntryPoints;
WINPR_ASSERT(instance);
WINPR_ASSERT(context);
pEntryPoints = instance->pClientEntryPoints;
WINPR_ASSERT(pEntryPoints);
return IFCALLRESULT(TRUE, pEntryPoints->ClientNew, instance, context);
}
static void freerdp_client_common_free(freerdp* instance, rdpContext* context)
{
RDP_CLIENT_ENTRY_POINTS* pEntryPoints = instance->pClientEntryPoints;
RDP_CLIENT_ENTRY_POINTS* pEntryPoints;
WINPR_ASSERT(instance);
WINPR_ASSERT(context);
pEntryPoints = instance->pClientEntryPoints;
WINPR_ASSERT(pEntryPoints);
IFCALL(pEntryPoints->ClientFree, instance, context);
}

4
client/common/cmdline.c
View File

@ -2400,6 +2400,10 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
{
settings->RedirectDrives = enable;
}
CommandLineSwitchCase(arg, "disable-output")
{
freerdp_settings_set_bool(settings, FreeRDP_DeactivateClientDecoding, enable);
}
CommandLineSwitchCase(arg, "home-drive")
{
settings->RedirectHomeDrive = enable;

3
client/common/cmdline.h
View File

@ -348,6 +348,9 @@ static const COMMAND_LINE_ARGUMENT_A args[] = {
"SPN authentication service class" },
{ "ssh-agent", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "ssh-agent",
"SSH Agent forwarding channel" },
{ "disable-output", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL,
"Deactivate all graphics decoding in the client session. Useful for load tests with many "
"simultaneous connections" },
{ "t", COMMAND_LINE_VALUE_REQUIRED, "<title>", NULL, NULL, -1, "title", "Window title" },
{ "themes", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, "themes" },
{ "timeout", COMMAND_LINE_VALUE_REQUIRED, "<time in ms>", "9000", NULL, -1, "timeout",

8
libfreerdp/crypto/tls.c
View File

@ -1504,9 +1504,11 @@ int tls_verify_certificate(rdpTls* tls, CryptoCert cert, const char* hostname, U
const char* old_issuer = certificate_data_get_issuer(stored_data);
const char* old_fp = certificate_data_get_fingerprint(stored_data);
const char* old_pem = certificate_data_get_pem(stored_data);
const BOOL fpIsAllocated =
!old_pem || !freerdp_settings_get_bool(
instance->settings, FreeRDP_CertificateCallbackPreferPEM);
char* fp;
if (old_pem && freerdp_settings_get_bool(instance->settings,
FreeRDP_CertificateCallbackPreferPEM))
if (!fpIsAllocated)
{
cflags |= VERIFY_CERT_FLAG_FP_IS_PEM;
fp = pem;
@ -1519,7 +1521,7 @@ int tls_verify_certificate(rdpTls* tls, CryptoCert cert, const char* hostname, U
accept_certificate = instance->VerifyChangedCertificateEx(
instance, hostname, port, common_name, subject, issuer, pem, old_subject,
old_issuer, old_fp, cflags);
if (!old_pem)
if (fpIsAllocated)
free(fp);
}
#if defined(WITH_FREERDP_DEPRECATED)

36
libfreerdp/gdi/gfx.c
View File

@ -137,11 +137,14 @@ static UINT gdi_ResetGraphics(RdpgfxClientContext* context,
free(pSurfaceIds);
if (!freerdp_client_codecs_reset(gdi->context->codecs,
freerdp_settings_get_codecs_flags(settings), gdi->width,
gdi->height))
if (!freerdp_settings_get_bool(gdi->context->settings, FreeRDP_DeactivateClientDecoding))
{
goto fail;
if (!freerdp_client_codecs_reset(gdi->context->codecs,
freerdp_settings_get_codecs_flags(settings), gdi->width,
gdi->height))
{
goto fail;
}
}
rc = CHANNEL_RC_OK;
@ -1070,21 +1073,28 @@ static UINT gdi_CreateSurface(RdpgfxClientContext* context,
{
UINT rc = ERROR_INTERNAL_ERROR;
gdiGfxSurface* surface;
rdpGdi* gdi;
WINPR_ASSERT(context);
WINPR_ASSERT(createSurface);
gdi = (rdpGdi*)context->custom;
WINPR_ASSERT(gdi);
WINPR_ASSERT(gdi->context);
EnterCriticalSection(&context->mux);
surface = (gdiGfxSurface*)calloc(1, sizeof(gdiGfxSurface));
if (!surface)
goto fail;
WINPR_ASSERT(context->codecs);
surface->codecs = context->codecs;
if (!surface->codecs)
if (!freerdp_settings_get_bool(gdi->context->settings, FreeRDP_DeactivateClientDecoding))
{
free(surface);
goto fail;
WINPR_ASSERT(context->codecs);
surface->codecs = context->codecs;
if (!surface->codecs)
{
free(surface);
goto fail;
}
}
surface->surfaceId = createSurface->surfaceId;
@ -1641,6 +1651,12 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx,
gfx->UpdateSurfaces = NULL;
gfx->SurfaceCommand = NULL;
}
if (freerdp_settings_get_bool(settings, FreeRDP_DeactivateClientDecoding))
{
gfx->UpdateSurfaceArea = NULL;
gfx->UpdateSurfaces = NULL;
gfx->SurfaceCommand = NULL;
}
return TRUE;
}

12
winpr/libwinpr/path/include/PathCchAppend.c
View File

@ -65,8 +65,8 @@ HRESULT PATH_CCH_APPEND(PWSTR pszPath, size_t cchPath, PCWSTR pszMore)
HRESULT PATH_CCH_APPEND(PSTR pszPath, size_t cchPath, PCSTR pszMore)
{
BOOL pathBackslash;
BOOL moreBackslash;
BOOL pathBackslash = FALSE;
BOOL moreBackslash = FALSE;
size_t pszMoreLength;
size_t pszPathLength;
@ -79,11 +79,13 @@ HRESULT PATH_CCH_APPEND(PSTR pszPath, size_t cchPath, PCSTR pszMore)
if (cchPath == 0 || cchPath > PATHCCH_MAX_CCH)
return E_INVALIDARG;
pszMoreLength = lstrlenA(pszMore);
pszPathLength = lstrlenA(pszPath);
if (pszPathLength > 0)
pathBackslash = (pszPath[pszPathLength - 1] == CUR_PATH_SEPARATOR_CHR) ? TRUE : FALSE;
pathBackslash = (pszPath[pszPathLength - 1] == CUR_PATH_SEPARATOR_CHR) ? TRUE : FALSE;
moreBackslash = (pszMore[0] == CUR_PATH_SEPARATOR_CHR) ? TRUE : FALSE;
pszMoreLength = lstrlenA(pszMore);
if (pszMoreLength > 0)
moreBackslash = (pszMore[0] == CUR_PATH_SEPARATOR_CHR) ? TRUE : FALSE;
if (pathBackslash && moreBackslash)
{

4
winpr/libwinpr/path/shell.c
View File

@ -416,8 +416,8 @@ char* GetCombinedPath(const char* basePath, const char* subPath)
HRESULT status;
char* path = NULL;
char* subPathCpy = NULL;
int basePathLength = 0;
int subPathLength = 0;
size_t basePathLength = 0;
size_t subPathLength = 0;
if (basePath)
basePathLength = strlen(basePath);