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

[client,common] Unescape /gateway option values

Browse Source 
To support escaped characters with /gateway all values are now
unuescaped before use.
This commit is contained in:
Armin Novak
2025-07-09 09:55:14 +02:00
parent 45b3cbf120
commit 2f617c9e39
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
client/common/cmdline.c
View File

@@ -4087,8 +4087,43 @@ static BOOL parse_gateway_usage_option(rdpSettings* settings, const char* value)
return freerdp_set_gateway_usage_method(settings, type);
}
static char* unescape(const char* str)
{
char* copy = strdup(str);
if (!copy)
return NULL;
bool escaped = false;
char* dst = copy;
while (*str != '\0')
{
char cur = *str++;
switch (cur)
{
case '\\':
if (!escaped)
{
escaped = true;
continue;
}
// fallthrough
WINPR_FALLTHROUGH
default:
*dst++ = cur;
escaped = false;
break;
}
}
*dst = '\0';
return copy;
}
static BOOL parse_gateway_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_A* arg)
{
char* argval = NULL;
BOOL rc = FALSE;
WINPR_ASSERT(settings);
@@ -4107,9 +4142,10 @@ static BOOL parse_gateway_options(rdpSettings* settings, const COMMAND_LINE_ARGU
for (size_t x = 0; x < count; x++)
{
BOOL validOption = FALSE;
const char* argval = ptr[x];
WINPR_ASSERT(argval);
free(argval);
argval = unescape(ptr[x]);
if (!argval)
goto fail;
const char* gw = option_starts_with("g:", argval);
if (gw)
@@ -4216,6 +4252,7 @@ static BOOL parse_gateway_options(rdpSettings* settings, const COMMAND_LINE_ARGU
rc = TRUE;
fail:
free(argval);
CommandLineParserFree(ptr);
return rc;
}