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

Merge pull request #4450 from akallabeth/assist_fix

Browse Source 
Assistance and RDP file parser fix
This commit is contained in:
Martin Fleisz 2018-02-21 16:56:55 +01:00 committed by GitHub
commit 8e5d5fa8ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client/common/cmdline.c
View File

@ -1294,12 +1294,25 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
char* str;
size_t length;
int status;
DWORD flags;
BOOL ext = FALSE;
BOOL assist = FALSE;
DWORD flags = 0;
BOOL promptForPassword = FALSE;
BOOL compatibility;
BOOL compatibility = FALSE;
COMMAND_LINE_ARGUMENT_A* arg;
compatibility = freerdp_client_detect_command_line(argc, argv, &flags,
allowUnknown);
/* Command line detection fails if only a .rdp or .msrcIncident file
* is supplied. Check this case first, only then try to detect
* legacy command line syntax. */
if (argc > 1)
{
ext = ends_with(argv[1], ".rdp");
assist = ends_with(argv[1], ".msrcIncident");
}
if (!ext && !assist)
compatibility = freerdp_client_detect_command_line(argc, argv, &flags,
allowUnknown);
if (compatibility)
{
@ -1309,27 +1322,19 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
else
{
if (allowUnknown)
{
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
if (ext)
{
if (freerdp_client_settings_parse_connection_file(settings, argv[1]))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
if (argc > 1)
if (assist)
{
const BOOL ext = ends_with(argv[1], ".rdp");
const BOOL assist = ends_with(argv[1], ".msrcIncident");
if (ext)
{
if (freerdp_client_settings_parse_connection_file(settings, argv[1]))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
if (assist)
{
if (freerdp_client_settings_parse_assistance_file(settings,
settings->AssistanceFile) < 0)
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
if (freerdp_client_settings_parse_assistance_file(settings,
argv[1]) < 0)
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
CommandLineClearArgumentsA(args);

4
libfreerdp/common/assistance.c
View File

@ -1057,6 +1057,10 @@ int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name)
FILE* fp = NULL;
size_t readSize;
INT64 fileSize;
if (!name)
return -1;
fp = fopen(name, "r");
if (!fp)