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

core: Fix handling of alternate shell if set to an empty string

Browse Source 
In case alternate shell was set to an empty string ("") the old code
would try to convert it to a WChar string. This resulted in a NULL
pointer being returned by `ConvertUtf8ToWCharAlloc` that was interpreted
as an error and the connection failed.
This commit is contained in:
Martin Fleisz
2022-12-15 09:40:31 +01:00
committed by akallabeth
parent 8c6ee2061b
commit 103c0a983c
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/core/info.c
View File

@@ -551,8 +551,8 @@ static BOOL rdp_write_extended_info_packet(rdpRdp* rdp, wStream* s)
if (!Stream_EnsureRemainingCapacity(s, 4ull))
goto fail;
Stream_Write_UINT16(s, 0); /* reserved1 (2 bytes) */
Stream_Write_UINT16(s, 0); /* reserved2 (2 bytes) */
Stream_Write_UINT16(s, 0); /* reserved1 (2 bytes) */
Stream_Write_UINT16(s, 0); /* reserved2 (2 bytes) */
}
if (settings->EarlyCapabilityFlags & RNS_UD_CS_SUPPORT_DYNAMIC_TIME_ZONE)
@@ -845,18 +845,17 @@ static BOOL rdp_write_info_packet(rdpRdp* rdp, wStream* s)
cbPassword = (UINT16)cbPassword * sizeof(WCHAR);
}
const char* rain = freerdp_settings_get_string(settings, FreeRDP_RemoteAssistancePassword);
const char* altShell;
if (!settings->RemoteAssistanceMode)
rain = freerdp_settings_get_string(settings, FreeRDP_AlternateShell);
altShell = freerdp_settings_get_string(settings, FreeRDP_AlternateShell);
else if (settings->RemoteAssistancePassStub)
altShell = "*"; /* This field MUST be filled with "*" */
else
altShell = freerdp_settings_get_string(settings, FreeRDP_RemoteAssistancePassword);
if (altShell && strlen(altShell) > 0)
{
/* This field MUST be filled with "*" */
if (settings->RemoteAssistancePassStub)
rain = "*";
}
if (rain)
{
alternateShellW = ConvertUtf8ToWCharAlloc(rain, &cbAlternateShell);
alternateShellW = ConvertUtf8ToWCharAlloc(altShell, &cbAlternateShell);
if (!alternateShellW || (cbAlternateShell > (UINT16_MAX / sizeof(WCHAR))))
goto fail;
cbAlternateShell = (UINT16)cbAlternateShell * sizeof(WCHAR);