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

Merge pull request #5615 from akallabeth/rdp_relaxed_parse

Browse Source 
Added option to parse RDP files relaxed.
This commit is contained in:
Martin Fleisz 2019-09-24 16:27:54 +02:00 committed by GitHub
commit db2ac11828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
client/common/file.c
View File

@ -198,6 +198,8 @@ struct rdp_file
char** argv;
size_t argSize;
void* context;
DWORD flags;
};
/*
@ -378,8 +380,16 @@ static BOOL freerdp_client_parse_rdp_file_integer(rdpFile* file, const char* nam
if ((endptr == NULL) || (errno != 0) || (endptr == value) ||
(ivalue > INT32_MAX) || (ivalue < INT32_MIN))
{
WLog_ERR(TAG, "Failed to convert RDP file integer option %s [value=%s]", name, value);
return FALSE;
if (file->flags & RDP_FILE_FLAG_PARSE_INT_RELAXED)
{
WLog_WARN(TAG, "Integer option %s has invalid value %s, using default", name, value);
return TRUE;
}
else
{
WLog_ERR(TAG, "Failed to convert RDP file integer option %s [value=%s]", name, value);
return FALSE;
}
}
freerdp_client_rdp_file_set_integer(file, name, ivalue, index);
@ -1775,45 +1785,47 @@ static void freerdp_client_file_string_check_free(LPSTR str)
if (~((size_t)str))
free(str);
}
rdpFile* freerdp_client_rdp_file_new()
rdpFile* freerdp_client_rdp_file_new(void)
{
rdpFile* file;
file = (rdpFile*)malloc(sizeof(rdpFile));
return freerdp_client_rdp_file_new_ex(0);
}
if (file)
{
FillMemory(file, sizeof(rdpFile), 0xFF);
file->lineCount = 0;
file->lineSize = 32;
file->lines = (rdpFileLine*)calloc(file->lineSize, sizeof(rdpFileLine));
rdpFile* freerdp_client_rdp_file_new_ex(DWORD flags)
{
rdpFile* file = (rdpFile*)malloc(sizeof(rdpFile));
if (!file->lines)
{
free(file);
return NULL;
}
if (!file)
return NULL;
file->argc = 0;
file->argSize = 32;
file->argv = (char**)calloc(file->argSize, sizeof(char*));
file->flags = flags;
if (!file->argv)
{
free(file->lines);
free(file);
return NULL;
}
FillMemory(file, sizeof(rdpFile), 0xFF);
file->argv = NULL;
file->lines = NULL;
file->lineCount = 0;
file->lineSize = 32;
file->lines = (rdpFileLine*)calloc(file->lineSize, sizeof(rdpFileLine));
if (!freerdp_client_add_option(file, "freerdp"))
{
free(file->argv);
free(file->lines);
free(file);
return NULL;
}
}
if (!file->lines)
goto fail;
file->argc = 0;
file->argSize = 32;
file->argv = (char**)calloc(file->argSize, sizeof(char*));
if (!file->argv)
goto fail;
if (!freerdp_client_add_option(file, "freerdp"))
goto fail;
return file;
fail:
free(file->argv);
free(file->lines);
free(file);
return NULL;
}
void freerdp_client_rdp_file_free(rdpFile* file)
{

4
include/freerdp/client/file.h
View File

@ -23,6 +23,9 @@
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
/* Ignore invalid integer values */
#define RDP_FILE_FLAG_PARSE_INT_RELAXED 1
typedef struct rdp_file rdpFile;
typedef BOOL (*rdp_file_fkt_parse)(void* context, const char* key, char type, const char* value);
@ -52,6 +55,7 @@ FREERDP_API int freerdp_client_rdp_file_set_integer_option(rdpFile* file, const
FREERDP_API int freerdp_client_rdp_file_get_integer_option(rdpFile* file, const char* name);
FREERDP_API rdpFile* freerdp_client_rdp_file_new(void);
FREERDP_API rdpFile* freerdp_client_rdp_file_new_ex(DWORD flags);
FREERDP_API void freerdp_client_rdp_file_free(rdpFile* file);
#ifdef __cplusplus