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

[c23,freerdp] replace NULL with nullptr

Browse Source
This commit is contained in:
Armin Novak
2026-02-26 15:06:27 +01:00
parent 20b4cb6edc
commit 5c510af477
225 changed files with 4115 additions and 4083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libfreerdp/common/addin.c
View File

@@ -47,7 +47,7 @@ static inline BOOL is_path_required(LPCSTR path, size_t len)
LPSTR freerdp_get_library_install_path(void)
{
LPSTR pszPath = NULL;
LPSTR pszPath = nullptr;
size_t cchPath = 0;
size_t cchLibraryPath = 0;
size_t cchInstallPrefix = 0;
@@ -62,12 +62,12 @@ LPSTR freerdp_get_library_install_path(void)
needLibPath = is_path_required(pszLibraryPath, cchLibraryPath);
if (!needInstallPath && !needLibPath)
return NULL;
return nullptr;
pszPath = (LPSTR)malloc(cchPath + 1);
if (!pszPath)
return NULL;
return nullptr;
if (needInstallPath)
{
@@ -80,7 +80,7 @@ LPSTR freerdp_get_library_install_path(void)
if (FAILED(NativePathCchAppendA(pszPath, cchPath + 1, pszLibraryPath)))
{
free(pszPath);
return NULL;
return nullptr;
}
}
@@ -90,9 +90,9 @@ LPSTR freerdp_get_library_install_path(void)
LPSTR freerdp_get_dynamic_addin_install_path(void)
{
#if defined(WITH_ADD_PLUGIN_TO_RPATH)
return NULL;
return nullptr;
#else
LPSTR pszPath = NULL;
LPSTR pszPath = nullptr;
size_t cchPath = 0;
size_t cchAddinPath = 0;
size_t cchInstallPrefix = 0;
@@ -111,12 +111,12 @@ LPSTR freerdp_get_dynamic_addin_install_path(void)
pszInstallPrefix, pszAddinPath);
if (!needInstallPath && !needLibPath)
return NULL;
return nullptr;
pszPath = (LPSTR)calloc(cchPath + 1, sizeof(CHAR));
if (!pszPath)
return NULL;
return nullptr;
if (needInstallPath)
{
@@ -129,7 +129,7 @@ LPSTR freerdp_get_dynamic_addin_install_path(void)
if (FAILED(NativePathCchAppendA(pszPath, cchPath + 1, pszAddinPath)))
{
free(pszPath);
return NULL;
return nullptr;
}
}
@@ -143,16 +143,16 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPa
LPCSTR pszEntryName)
{
LPSTR pszAddinInstallPath = freerdp_get_dynamic_addin_install_path();
PVIRTUALCHANNELENTRY entry = NULL;
PVIRTUALCHANNELENTRY entry = nullptr;
BOOL bHasExt = TRUE;
PCSTR pszExt = NULL;
PCSTR pszExt = nullptr;
size_t cchExt = 0;
HINSTANCE library = NULL;
HINSTANCE library = nullptr;
size_t cchFileName = 0;
size_t cchFilePath = 0;
LPSTR pszAddinFile = NULL;
LPSTR pszFilePath = NULL;
LPSTR pszRelativeFilePath = NULL;
LPSTR pszAddinFile = nullptr;
LPSTR pszFilePath = nullptr;
LPSTR pszRelativeFilePath = nullptr;
size_t cchAddinFile = 0;
size_t cchAddinInstallPath = 0;
@@ -253,8 +253,8 @@ fail:
PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem,
LPCSTR pszType, DWORD dwFlags)
{
PVIRTUALCHANNELENTRY entry = NULL;
LPSTR pszFileName = NULL;
PVIRTUALCHANNELENTRY entry = nullptr;
LPSTR pszFileName = nullptr;
const size_t cchBaseFileName = sizeof(FREERDP_SHARED_LIBRARY_PREFIX) + 32;
size_t nameLen = 0;
size_t subsystemLen = 0;
@@ -274,7 +274,7 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
pszFileName = (LPSTR)malloc(cchFileName);
if (!pszFileName)
return NULL;
return nullptr;
(void)sprintf_s(pszFileName, cchFileName, "%s-client-%s-%s", pszName, pszSubsystem,
pszType);
@@ -285,7 +285,7 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
pszFileName = (LPSTR)malloc(cchFileName);
if (!pszFileName)
return NULL;
return nullptr;
(void)sprintf_s(pszFileName, cchFileName, "%s-client-%s", pszName, pszSubsystem);
}
@@ -295,13 +295,13 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
pszFileName = (LPSTR)malloc(cchFileName);
if (!pszFileName)
return NULL;
return nullptr;
(void)sprintf_s(pszFileName, cchFileName, "%s-client", pszName);
}
else
{
return NULL;
return nullptr;
}
{
@@ -321,13 +321,13 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
if (!pszFileName || (rc < 0))
{
free(pszFileName);
return NULL;
return nullptr;
}
}
if (pszSubsystem)
{
LPSTR pszEntryName = NULL;
LPSTR pszEntryName = nullptr;
size_t cchEntryName = 0;
/* subsystem add-in */
cchEntryName = 64 + nameLen;
@@ -336,12 +336,12 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
if (!pszEntryName)
{
free(pszFileName);
return NULL;
return nullptr;
}
(void)sprintf_s(pszEntryName, cchEntryName + 1, "freerdp_%s_client_subsystem_entry",
pszName);
entry = freerdp_load_dynamic_addin(pszFileName, NULL, pszEntryName);
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, pszEntryName);
free(pszEntryName);
free(pszFileName);
return entry;
@@ -352,22 +352,22 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LP
if (dwFlags & FREERDP_ADDIN_CHANNEL_STATIC)
{
if (dwFlags & FREERDP_ADDIN_CHANNEL_ENTRYEX)
entry = freerdp_load_dynamic_addin(pszFileName, NULL, "VirtualChannelEntryEx");
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "VirtualChannelEntryEx");
else
entry = freerdp_load_dynamic_addin(pszFileName, NULL, "VirtualChannelEntry");
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "VirtualChannelEntry");
}
else if (dwFlags & FREERDP_ADDIN_CHANNEL_DYNAMIC)
entry = freerdp_load_dynamic_addin(pszFileName, NULL, "DVCPluginEntry");
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "DVCPluginEntry");
else if (dwFlags & FREERDP_ADDIN_CHANNEL_DEVICE)
entry = freerdp_load_dynamic_addin(pszFileName, NULL, "DeviceServiceEntry");
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, "DeviceServiceEntry");
else
entry = freerdp_load_dynamic_addin(pszFileName, NULL, pszType);
entry = freerdp_load_dynamic_addin(pszFileName, nullptr, pszType);
free(pszFileName);
return entry;
}
static FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_load_static_channel_addin_entry = NULL;
static FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_load_static_channel_addin_entry = nullptr;
int freerdp_register_addin_provider(FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN provider,
WINPR_ATTR_UNUSED DWORD dwFlags)
@@ -384,7 +384,7 @@ FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN freerdp_get_current_addin_provider(void)
PVIRTUALCHANNELENTRY freerdp_load_channel_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem,
LPCSTR pszType, DWORD dwFlags)
{
PVIRTUALCHANNELENTRY entry = NULL;
PVIRTUALCHANNELENTRY entry = nullptr;
if (freerdp_load_static_channel_addin_entry)
entry = freerdp_load_static_channel_addin_entry(pszName, pszSubsystem, pszType, dwFlags);

127
libfreerdp/common/assistance.c
View File

@@ -80,14 +80,14 @@ static const char* strrstr(const char* haystack, size_t len, const char* needle)
if (*needle == '\0')
return haystack;
char* result = NULL;
char* result = nullptr;
for (;;)
{
char* p = strstr(haystack, needle);
if (p == NULL)
if (p == nullptr)
break;
if (p > haystack + len)
return NULL;
return nullptr;
result = p;
haystack = p + 1;
@@ -100,14 +100,14 @@ static BOOL update_option(char** opt, const char* val, size_t len)
{
WINPR_ASSERT(opt);
free(*opt);
*opt = NULL;
*opt = nullptr;
if (!val && (len != 0))
return FALSE;
else if (!val && (len == 0))
return TRUE;
*opt = strndup(val, len);
return *opt != NULL;
return *opt != nullptr;
}
static BOOL update_name(rdpAssistanceFile* file, const char* name)
@@ -122,34 +122,34 @@ static BOOL update_name(rdpAssistanceFile* file, const char* name)
free(file->filename);
file->filename = _strdup(name);
return file->filename != NULL;
return file->filename != nullptr;
}
static BOOL update_password(rdpAssistanceFile* file, const char* password)
{
WINPR_ASSERT(file);
free(file->password);
file->password = NULL;
file->password = nullptr;
if (!password)
return TRUE;
file->password = _strdup(password);
return file->password != NULL;
return file->password != nullptr;
}
static BOOL update_connectionstring2_nocopy(rdpAssistanceFile* file, char* str)
{
WINPR_ASSERT(file);
free(file->ConnectionString2);
file->ConnectionString2 = NULL;
file->ConnectionString2 = nullptr;
if (!str)
return TRUE;
file->ConnectionString2 = str;
return file->ConnectionString2 != NULL;
return file->ConnectionString2 != nullptr;
}
static BOOL update_connectionstring2(rdpAssistanceFile* file, const char* str, size_t len)
{
char* strc = NULL;
char* strc = nullptr;
if (!str && (len != 0))
return FALSE;
@@ -164,14 +164,14 @@ static BOOL update_connectionstring2(rdpAssistanceFile* file, const char* str, s
static BOOL update_connectionstring2_wchar(rdpAssistanceFile* file, const WCHAR* str, size_t len)
{
char* strc = NULL;
char* strc = nullptr;
if (!str && (len != 0))
return FALSE;
if (str && (len > 0))
{
strc = ConvertWCharNToUtf8Alloc(str, len, NULL);
strc = ConvertWCharNToUtf8Alloc(str, len, nullptr);
if (!strc)
return FALSE;
}
@@ -253,7 +253,7 @@ fail:
static BOOL append_address_to_list(wArrayList* MachineAddresses, const char* str, size_t len)
{
char* copy = NULL;
char* copy = nullptr;
if (len > 0)
copy = strndup(str, len);
if (!copy)
@@ -271,7 +271,7 @@ static BOOL append_address(rdpAssistanceFile* file, const char* host, const char
WINPR_ASSERT(file);
errno = 0;
unsigned long p = strtoul(port, NULL, 0);
unsigned long p = strtoul(port, nullptr, 0);
if ((errno != 0) || (p == 0) || (p > UINT16_MAX))
{
@@ -300,11 +300,11 @@ static BOOL freerdp_assistance_parse_address_list(rdpAssistanceFile* file, char*
char* s = ";";
// get the first token
char* saveptr = NULL;
char* saveptr = nullptr;
char* token = strtok_s(strp, s, &saveptr);
// walk through other tokens
while (token != NULL)
while (token != nullptr)
{
char* port = strchr(token, ':');
if (!port)
@@ -315,7 +315,7 @@ static BOOL freerdp_assistance_parse_address_list(rdpAssistanceFile* file, char*
if (!append_address(file, token, port))
goto out;
token = strtok_s(NULL, s, &saveptr);
token = strtok_s(nullptr, s, &saveptr);
}
rc = TRUE;
out:
@@ -425,7 +425,7 @@ static BOOL freerdp_assistance_parse_attr(const char** opt, size_t* plength, con
WINPR_ASSERT(plength);
WINPR_ASSERT(key);
*opt = NULL;
*opt = nullptr;
*plength = 0;
if (!tag)
return FALSE;
@@ -468,7 +468,7 @@ static BOOL freerdp_assistance_parse_attr(const char** opt, size_t* plength, con
static BOOL freerdp_assistance_parse_attr_str(char** opt, const char* key, const char* tag)
{
const char* copt = NULL;
const char* copt = nullptr;
size_t size = 0;
if (!freerdp_assistance_parse_attr(&copt, &size, key, tag))
return FALSE;
@@ -477,7 +477,7 @@ static BOOL freerdp_assistance_parse_attr_str(char** opt, const char* key, const
static BOOL freerdp_assistance_parse_attr_bool(BOOL* opt, const char* key, const char* tag)
{
const char* copt = NULL;
const char* copt = nullptr;
size_t size = 0;
WINPR_ASSERT(opt);
@@ -494,7 +494,7 @@ static BOOL freerdp_assistance_parse_attr_bool(BOOL* opt, const char* key, const
static BOOL freerdp_assistance_parse_attr_uint32(UINT32* opt, const char* key, const char* tag)
{
const char* copt = NULL;
const char* copt = nullptr;
size_t size = 0;
WINPR_ASSERT(opt);
@@ -514,7 +514,7 @@ static BOOL freerdp_assistance_parse_attr_uint32(UINT32* opt, const char* key, c
strncpy(buffer, copt, size);
errno = 0;
unsigned long val = strtoul(buffer, NULL, 0);
unsigned long val = strtoul(buffer, nullptr, 0);
if ((errno != 0) || (val > UINT32_MAX))
{
@@ -539,11 +539,11 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const
WINPR_ASSERT(rc > 0);
WINPR_ASSERT((size_t)rc < sizeof(bkey));
if ((rc < 0) || ((size_t)rc >= sizeof(bkey)))
return NULL;
return nullptr;
char* tag = strstr(input, bkey);
if (!tag || (tag > input + ilen))
return NULL;
return nullptr;
char* data = tag + strnlen(bkey, sizeof(bkey));
@@ -560,7 +560,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const
"Failed to parse ASSISTANCE file: ConnectionString2 missing delimiter after "
"field %s",
bkey);
return NULL;
return nullptr;
}
char* start = strstr(tag, ">");
@@ -568,7 +568,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const
if (!start || (start > input + ilen))
{
WLog_ERR(TAG, "Failed to parse ASSISTANCE file: ConnectionString2 missing field %s", bkey);
return NULL;
return nullptr;
}
const char* end = start;
@@ -580,7 +580,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const
WINPR_ASSERT(erc > 0);
WINPR_ASSERT((size_t)erc < sizeof(ekey));
if ((erc <= 0) || ((size_t)erc >= sizeof(ekey)))
return NULL;
return nullptr;
const size_t offset = WINPR_ASSERTING_INT_CAST(size_t, start - tag);
dend = end = strrstr(start, ilen - offset, ekey);
if (end)
@@ -592,7 +592,7 @@ static char* freerdp_assistance_contains_element(char* input, size_t ilen, const
WLog_ERR(TAG,
"Failed to parse ASSISTANCE file: ConnectionString2 missing end tag for field %s",
key);
return NULL;
return nullptr;
}
if (plen)
*plen = WINPR_ASSERTING_INT_CAST(size_t, end - tag);
@@ -619,7 +619,7 @@ static BOOL freerdp_assistance_consume_input_and_get_element(char* input, const
size_t len = 0;
size_t dlen = 0;
char* data = NULL;
char* data = nullptr;
char* tag = freerdp_assistance_contains_element(input, strlen(input), key, &len, &data, &dlen);
if (!tag)
return FALSE;
@@ -642,7 +642,7 @@ static BOOL freerdp_assistance_get_element(char* input, size_t ilen, const char*
size_t len = 0;
size_t dlen = 0;
char* data = NULL;
char* data = nullptr;
char* tag = freerdp_assistance_contains_element(input, ilen, key, &len, &data, &dlen);
if (!tag)
return FALSE;
@@ -661,7 +661,7 @@ static BOOL freerdp_assistance_parse_all_elements_of(rdpAssistanceFile* file, ch
BOOL (*fkt)(rdpAssistanceFile* file,
char* data, size_t len))
{
char* val = NULL;
char* val = nullptr;
size_t vlen = 0;
while (freerdp_assistance_get_element(data, len, key, &val, &vlen))
@@ -684,8 +684,8 @@ static BOOL freerdp_assistance_parse_all_elements_of_l(rdpAssistanceFile* file,
WINPR_ATTR_UNUSED size_t len)
{
UINT32 p = 0;
const char* n = NULL;
const char* u = NULL;
const char* n = nullptr;
const char* u = nullptr;
size_t nlen = 0;
size_t ulen = 0;
if (!freerdp_assistance_parse_attr_uint32(&p, "P", data))
@@ -754,7 +754,7 @@ static BOOL freerdp_assistance_parse_connection_string2(rdpAssistanceFile* file)
goto out_fail;
{
char* e = NULL;
char* e = nullptr;
size_t elen = 0;
if (!freerdp_assistance_consume_input_and_get_element(str, "E", &e, &elen))
goto out_fail;
@@ -762,7 +762,7 @@ static BOOL freerdp_assistance_parse_connection_string2(rdpAssistanceFile* file)
if (!e || (elen == 0))
goto out_fail;
{
char* a = NULL;
char* a = nullptr;
size_t alen = 0;
if (!freerdp_assistance_get_element(e, elen, "A", &a, &alen))
goto out_fail;
@@ -797,7 +797,7 @@ out_fail:
char* freerdp_assistance_construct_expert_blob(const char* name, const char* pass)
{
if (!name || !pass)
return NULL;
return nullptr;
const size_t nameLength = strlen(name) + strlen("NAME=");
const size_t passLength = strlen(pass) + strlen("PASS=");
@@ -805,7 +805,7 @@ char* freerdp_assistance_construct_expert_blob(const char* name, const char* pas
char* ExpertBlob = (char*)calloc(1, size);
if (!ExpertBlob)
return NULL;
return nullptr;
(void)sprintf_s(ExpertBlob, size, "%" PRIuz ";NAME=%s%" PRIuz ";PASS=%s", nameLength, name,
passLength, pass);
@@ -829,7 +829,7 @@ char* freerdp_assistance_generate_pass_stub(WINPR_ATTR_UNUSED DWORD flags)
char* passStub = calloc(15, sizeof(char));
if (!passStub)
return NULL;
return nullptr;
/**
* PassStub generation:
@@ -861,10 +861,10 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
size_t cbPasswordW = 0;
size_t cbPassStubW = 0;
BYTE PasswordHash[WINPR_MD5_DIGEST_LENGTH] = WINPR_C_ARRAY_INIT;
WINPR_RC4_CTX* rc4Ctx = NULL;
BYTE* pbIn = NULL;
BYTE* pbOut = NULL;
BYTE* res = NULL;
WINPR_RC4_CTX* rc4Ctx = nullptr;
BYTE* pbIn = nullptr;
BYTE* pbOut = nullptr;
BYTE* res = nullptr;
WCHAR* PasswordW = ConvertUtf8ToWCharAlloc(password, &cbPasswordW);
WCHAR* PassStubW = ConvertUtf8ToWCharAlloc(passStub, &cbPassStubW);
@@ -922,10 +922,10 @@ static BOOL freerdp_assistance_decrypt2(rdpAssistanceFile* file)
int status = 0;
size_t cbPasswordW = 0;
size_t cchOutW = 0;
WINPR_CIPHER_CTX* aesDec = NULL;
WCHAR* PasswordW = NULL;
BYTE* pbIn = NULL;
BYTE* pbOut = NULL;
WINPR_CIPHER_CTX* aesDec = nullptr;
WCHAR* PasswordW = nullptr;
BYTE* pbIn = nullptr;
BYTE* pbOut = nullptr;
size_t cbOut = 0;
size_t cbIn = 0;
size_t cbFinal = 0;
@@ -1011,19 +1011,19 @@ fail:
BYTE* freerdp_assistance_hex_string_to_bin(const void* str, size_t* size)
{
BYTE* buffer = NULL;
BYTE* buffer = nullptr;
if (!str || !size)
return NULL;
return nullptr;
*size = 0;
const size_t length = strlen(str);
buffer = calloc(length, sizeof(BYTE));
if (!buffer)
return NULL;
return nullptr;
const size_t rc = winpr_HexStringToBinBuffer(str, length, buffer, length);
if (rc == 0)
{
free(buffer);
return NULL;
return nullptr;
}
*size = rc;
return buffer;
@@ -1039,7 +1039,7 @@ static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* up
{
const char escalated[9] = { 'E', 's', 'c', 'a', 'l', 'a', 't', 'e', 'd' };
const size_t esclen = sizeof(escalated);
const char* typestr = NULL;
const char* typestr = nullptr;
size_t typelen = 0;
if (!uploadinfo || (uploadinfosize == 0))
@@ -1063,7 +1063,7 @@ static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* up
return -1;
}
char* uploaddata = NULL;
char* uploaddata = nullptr;
size_t uploaddatasize = 0;
if (!freerdp_assistance_consume_input_and_get_element(uploadinfo, "UPLOADDATA", &uploaddata,
&uploaddatasize))
@@ -1166,14 +1166,15 @@ static int freerdp_assistance_parse_file_buffer_int(rdpAssistanceFile* file, cha
if (!update_password(file, password))
return -1;
char* uploadinfo = NULL;
char* uploadinfo = nullptr;
size_t uploadinfosize = 0;
if (freerdp_assistance_consume_input_and_get_element(buffer, "UPLOADINFO", &uploadinfo,
&uploadinfosize))
return freerdp_assistance_parse_uploadinfo(file, uploadinfo, uploadinfosize);
size_t elen = 0;
const char* estr = freerdp_assistance_contains_element(buffer, size, "E", &elen, NULL, NULL);
const char* estr =
freerdp_assistance_contains_element(buffer, size, "E", &elen, nullptr, nullptr);
if (!estr || (elen == 0))
{
WLog_ERR(TAG, "Failed to parse ASSISTANCE file: Neither UPLOADINFO nor <E> found");
@@ -1220,8 +1221,8 @@ int freerdp_assistance_parse_file_buffer(rdpAssistanceFile* file, const char* cb
int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name, const char* password)
{
int status = 0;
BYTE* buffer = NULL;
FILE* fp = NULL;
BYTE* buffer = nullptr;
FILE* fp = nullptr;
size_t readSize = 0;
union
{
@@ -1273,7 +1274,7 @@ int freerdp_assistance_parse_file(rdpAssistanceFile* file, const char* name, con
{
WLog_ERR(TAG, "Failed to read ASSISTANCE file %s ", name);
free(buffer);
buffer = NULL;
buffer = nullptr;
return -1;
}
@@ -1394,7 +1395,7 @@ rdpAssistanceFile* freerdp_assistance_file_new(void)
winpr_InitializeSSL(WINPR_SSL_INIT_DEFAULT);
rdpAssistanceFile* file = calloc(1, sizeof(rdpAssistanceFile));
if (!file)
return NULL;
return nullptr;
file->MachineAddresses = ArrayList_New(FALSE);
file->MachinePorts = ArrayList_New(FALSE);
@@ -1413,7 +1414,7 @@ fail:
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_assistance_file_free(file);
WINPR_PRAGMA_DIAG_POP
return NULL;
return nullptr;
}
void freerdp_assistance_file_free(rdpAssistanceFile* file)
@@ -1421,8 +1422,8 @@ void freerdp_assistance_file_free(rdpAssistanceFile* file)
if (!file)
return;
update_password(file, NULL);
update_connectionstring2(file, NULL, 0);
update_password(file, nullptr);
update_connectionstring2(file, nullptr, 0);
free(file->filename);
free(file->Username);
free(file->LHTicket);
@@ -1460,7 +1461,7 @@ void freerdp_assistance_print_file(rdpAssistanceFile* file, wLog* log, DWORD lev
for (size_t x = 0; x < ArrayList_Count(file->MachineAddresses); x++)
{
UINT32 port = 0;
const char* uri = NULL;
const char* uri = nullptr;
const char* addr = ArrayList_GetItem(file->MachineAddresses, x);
if (x < ArrayList_Count(file->MachinePorts))
{

244
libfreerdp/common/settings.c
View File

@@ -85,7 +85,7 @@ BOOL freerdp_addin_argv_del_argument(ADDIN_ARGV* args, const char* argument)
(WINPR_ASSERTING_INT_CAST(uint32_t, args->argc - x)) * sizeof(char*),
(void*)&args->argv[x + 1],
(WINPR_ASSERTING_INT_CAST(uint32_t, args->argc - x - 1)) * sizeof(char*));
args->argv[args->argc - 1] = NULL;
args->argv[args->argc - 1] = nullptr;
args->argc--;
return TRUE;
}
@@ -137,8 +137,8 @@ int freerdp_addin_replace_argument(ADDIN_ARGV* args, const char* previous, const
int freerdp_addin_set_argument_value(ADDIN_ARGV* args, const char* option, const char* value)
{
BOOL rc = 0;
char* p = NULL;
char* str = NULL;
char* p = nullptr;
char* str = nullptr;
size_t length = 0;
if (!args || !option || !value)
return -2;
@@ -177,7 +177,7 @@ int freerdp_addin_replace_argument_value(ADDIN_ARGV* args, const char* previous,
const char* value)
{
BOOL rc = 0;
char* str = NULL;
char* str = nullptr;
size_t length = 0;
if (!args || !previous || !option || !value)
return -2;
@@ -226,7 +226,7 @@ BOOL freerdp_device_collection_add(rdpSettings* settings, RDPDR_DEVICE* device)
settings->DeviceArray = new_array;
for (size_t x = old; x < new_size; x++)
settings->DeviceArray[x] = NULL;
settings->DeviceArray[x] = nullptr;
if (!freerdp_settings_set_uint32(settings, FreeRDP_DeviceArraySize,
WINPR_ASSERTING_INT_CAST(uint32_t, new_size)))
@@ -255,7 +255,7 @@ BOOL freerdp_device_collection_del(rdpSettings* settings, const RDPDR_DEVICE* de
RDPDR_DEVICE* next = settings->DeviceArray[y];
settings->DeviceArray[y - 1] = next;
}
settings->DeviceArray[count - 1] = NULL;
settings->DeviceArray[count - 1] = nullptr;
settings->DeviceCount--;
return TRUE;
}
@@ -266,7 +266,7 @@ BOOL freerdp_device_collection_del(rdpSettings* settings, const RDPDR_DEVICE* de
RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* name)
{
RDPDR_DEVICE* device = NULL;
RDPDR_DEVICE* device = nullptr;
WINPR_ASSERT(settings);
WINPR_ASSERT(name);
@@ -281,12 +281,12 @@ RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char*
return device;
}
return NULL;
return nullptr;
}
RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 type)
{
RDPDR_DEVICE* device = NULL;
RDPDR_DEVICE* device = nullptr;
WINPR_ASSERT(settings);
for (UINT32 index = 0; index < settings->DeviceCount; index++)
@@ -297,7 +297,7 @@ RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32
return device;
}
return NULL;
return nullptr;
}
RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const args[])
@@ -313,7 +313,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar
RDPDR_SMARTCARD* smartcard;
} device;
device.base = NULL;
device.base = nullptr;
WINPR_ASSERT(args || (count == 0));
switch (Type)
@@ -404,7 +404,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar
goto fail;
}
if (count > 2)
device.drive->automount = (args[2] == NULL);
device.drive->automount = (args[2] == nullptr);
break;
default:
goto fail;
@@ -414,7 +414,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar
fail:
freerdp_device_free(device.base);
return NULL;
return nullptr;
}
void freerdp_device_free(RDPDR_DEVICE* device)
@@ -483,11 +483,11 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device)
size_t count = 0;
const char* args[4] = WINPR_C_ARRAY_INIT;
copy.dev = NULL;
copy.dev = nullptr;
src.dev = device;
if (!device)
return NULL;
return nullptr;
if (device->Name)
{
@@ -500,7 +500,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device)
if (src.drive->Path)
{
args[count++] = src.drive->Path;
args[count++] = src.drive->automount ? NULL : src.drive->Path;
args[count++] = src.drive->automount ? nullptr : src.drive->Path;
}
break;
@@ -534,7 +534,7 @@ RDPDR_DEVICE* freerdp_device_clone(const RDPDR_DEVICE* device)
copy.dev = freerdp_device_new(device->Type, count, args);
if (!copy.dev)
return NULL;
return nullptr;
copy.dev->Id = device->Id;
@@ -548,12 +548,12 @@ void freerdp_device_collection_free(rdpSettings* settings)
if (settings->DeviceArray)
{
for (UINT32 index = 0; index < settings->DeviceArraySize; index++)
freerdp_settings_set_pointer_array(settings, FreeRDP_DeviceArray, index, NULL);
freerdp_settings_set_pointer_array(settings, FreeRDP_DeviceArray, index, nullptr);
}
free((void*)settings->DeviceArray);
freerdp_settings_set_pointer(settings, FreeRDP_DeviceArray, NULL);
freerdp_settings_set_pointer(settings, FreeRDP_DeviceArray, nullptr);
freerdp_settings_set_uint32(settings, FreeRDP_DeviceArraySize, 0);
freerdp_settings_set_uint32(settings, FreeRDP_DeviceCount, 0);
}
@@ -576,7 +576,7 @@ BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* na
(void*)&settings->StaticChannelArray[x + 1],
(count - x - 1) * sizeof(ADDIN_ARGV*));
for (size_t y = count - 1; y < settings->StaticChannelArraySize; y++)
settings->StaticChannelArray[y] = NULL;
settings->StaticChannelArray[y] = nullptr;
freerdp_addin_argv_free(cur);
return freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelCount, count - 1);
@@ -585,7 +585,7 @@ BOOL freerdp_static_channel_collection_del(rdpSettings* settings, const char* na
}
{
for (size_t x = count; x < settings->StaticChannelArraySize; x++)
settings->StaticChannelArray[x] = NULL;
settings->StaticChannelArray[x] = nullptr;
}
return FALSE;
}
@@ -612,7 +612,7 @@ BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* ch
settings->StaticChannelArray = new_array;
{
for (size_t x = oldSize; x < new_size; x++)
settings->StaticChannelArray[x] = NULL;
settings->StaticChannelArray[x] = nullptr;
}
if (!freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelArraySize,
WINPR_ASSERTING_INT_CAST(uint32_t, new_size)))
@@ -629,7 +629,7 @@ BOOL freerdp_static_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* ch
ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const char* name)
{
ADDIN_ARGV* channel = NULL;
ADDIN_ARGV* channel = nullptr;
WINPR_ASSERT(settings);
WINPR_ASSERT(name);
@@ -643,7 +643,7 @@ ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const
return channel;
}
return NULL;
return nullptr;
}
void freerdp_static_channel_collection_free(rdpSettings* settings)
@@ -660,7 +660,7 @@ void freerdp_static_channel_collection_free(rdpSettings* settings)
free((void*)settings->StaticChannelArray);
freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelArraySize, 0);
settings->StaticChannelArray = NULL;
settings->StaticChannelArray = nullptr;
freerdp_settings_set_uint32(settings, FreeRDP_StaticChannelCount, 0);
}
@@ -682,7 +682,7 @@ BOOL freerdp_dynamic_channel_collection_del(rdpSettings* settings, const char* n
(void*)&settings->DynamicChannelArray[x + 1],
(count - x - 1) * sizeof(ADDIN_ARGV*));
for (size_t y = count - 1; y < settings->DynamicChannelArraySize; y++)
settings->DynamicChannelArray[y] = NULL;
settings->DynamicChannelArray[y] = nullptr;
freerdp_addin_argv_free(cur);
return freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount,
@@ -717,7 +717,7 @@ BOOL freerdp_dynamic_channel_collection_add(rdpSettings* settings, ADDIN_ARGV* c
settings->DynamicChannelArray = new_array;
{
for (size_t x = oldSize; x < size; x++)
settings->DynamicChannelArray[x] = NULL;
settings->DynamicChannelArray[x] = nullptr;
}
if (!freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelArraySize,
WINPR_ASSERTING_INT_CAST(uint32_t, size)))
@@ -743,7 +743,7 @@ ADDIN_ARGV* freerdp_dynamic_channel_collection_find(const rdpSettings* settings,
return channel;
}
return NULL;
return nullptr;
}
void freerdp_addin_argv_free(ADDIN_ARGV* args)
@@ -764,11 +764,11 @@ void freerdp_addin_argv_free(ADDIN_ARGV* args)
ADDIN_ARGV* freerdp_addin_argv_new(size_t argc, const char* const argv[])
{
if (argc > INT32_MAX)
return NULL;
return nullptr;
ADDIN_ARGV* args = calloc(1, sizeof(ADDIN_ARGV));
if (!args)
return NULL;
return nullptr;
if (argc == 0)
return args;
@@ -793,7 +793,7 @@ fail:
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_addin_argv_free(args);
WINPR_PRAGMA_DIAG_POP
return NULL;
return nullptr;
}
ADDIN_ARGV* freerdp_addin_argv_clone(const ADDIN_ARGV* args)
@@ -804,7 +804,7 @@ ADDIN_ARGV* freerdp_addin_argv_clone(const ADDIN_ARGV* args)
const char** cc;
} cnv;
if (!args)
return NULL;
return nullptr;
cnv.c = args->argv;
return freerdp_addin_argv_new(WINPR_ASSERTING_INT_CAST(uint32_t, args->argc), cnv.cc);
}
@@ -822,7 +822,7 @@ void freerdp_dynamic_channel_collection_free(rdpSettings* settings)
free((void*)settings->DynamicChannelArray);
freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelArraySize, 0);
settings->DynamicChannelArray = NULL;
settings->DynamicChannelArray = nullptr;
freerdp_settings_set_uint32(settings, FreeRDP_DynamicChannelCount, 0);
}
@@ -835,12 +835,12 @@ static void freerdp_capability_data_free(rdpSettings* settings, size_t offset, B
for (size_t x = offset; x < settings->ReceivedCapabilitiesSize; x++)
{
free(settings->ReceivedCapabilityData[x]);
settings->ReceivedCapabilityData[x] = NULL;
settings->ReceivedCapabilityData[x] = nullptr;
}
if (full)
{
free((void*)settings->ReceivedCapabilityData);
settings->ReceivedCapabilityData = NULL;
settings->ReceivedCapabilityData = nullptr;
}
}
}
@@ -852,10 +852,10 @@ void freerdp_capability_buffer_free(rdpSettings* settings)
freerdp_capability_data_free(settings, 0, TRUE);
free(settings->ReceivedCapabilityDataSizes);
settings->ReceivedCapabilityDataSizes = NULL;
settings->ReceivedCapabilityDataSizes = nullptr;
free(settings->ReceivedCapabilities);
settings->ReceivedCapabilities = NULL;
settings->ReceivedCapabilities = nullptr;
settings->ReceivedCapabilitiesSize = 0;
}
@@ -900,7 +900,7 @@ static BOOL resize_setting_ptr(rdpSettings* settings, FreeRDP_Settings_Keys_Poin
uint8_t** optr = WINPR_REINTERPRET_CAST(ptr, uint8_t*, uint8_t**);
for (size_t x = oldsize; x < size; x++)
{
optr[x] = NULL;
optr[x] = nullptr;
}
// NOLINTNEXTLINE(clang-analyzer-unix.Malloc
@@ -972,7 +972,7 @@ BOOL freerdp_capability_buffer_copy(rdpSettings* settings, const rdpSettings* sr
else
{
free(settings->ReceivedCapabilityData[x]);
settings->ReceivedCapabilityData[x] = NULL;
settings->ReceivedCapabilityData[x] = nullptr;
}
}
return TRUE;
@@ -987,7 +987,7 @@ static void target_net_addresses_free(rdpSettings* settings, size_t offset)
for (size_t index = offset; index < settings->TargetNetAddressCount; index++)
{
free(settings->TargetNetAddresses[index]);
settings->TargetNetAddresses[index] = NULL;
settings->TargetNetAddresses[index] = nullptr;
}
}
}
@@ -999,10 +999,10 @@ void freerdp_target_net_addresses_free(rdpSettings* settings)
target_net_addresses_free(settings, 0);
free((void*)settings->TargetNetAddresses);
settings->TargetNetAddresses = NULL;
settings->TargetNetAddresses = nullptr;
free(settings->TargetNetPorts);
settings->TargetNetPorts = NULL;
settings->TargetNetPorts = nullptr;
settings->TargetNetAddressCount = 0;
}
@@ -1037,7 +1037,7 @@ void freerdp_server_license_issuers_free(rdpSettings* settings)
free(settings->ServerLicenseProductIssuers[x]);
}
free((void*)settings->ServerLicenseProductIssuers);
settings->ServerLicenseProductIssuers = NULL;
settings->ServerLicenseProductIssuers = nullptr;
settings->ServerLicenseProductIssuersCount = 0;
}
@@ -1046,7 +1046,7 @@ BOOL freerdp_server_license_issuers_copy(rdpSettings* settings, char** issuers,
WINPR_ASSERT(settings);
WINPR_ASSERT(issuers || (count == 0));
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerLicenseProductIssuers, NULL,
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ServerLicenseProductIssuers, nullptr,
count))
return FALSE;
@@ -1221,7 +1221,7 @@ int freerdp_set_param_string(rdpSettings* settings, int id, const char* param)
static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, ULONGLONG max)
{
char* endptr = NULL;
char* endptr = nullptr;
unsigned long long rc = 0;
if (!value || !result)
@@ -1245,7 +1245,7 @@ static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, U
static BOOL value_to_int(const char* value, LONGLONG* result, LONGLONG min, LONGLONG max)
{
char* endptr = NULL;
char* endptr = nullptr;
long long rc = 0;
if (!value || !result)
@@ -1377,10 +1377,10 @@ BOOL freerdp_settings_set_pointer_len_(rdpSettings* settings, FreeRDP_Settings_K
size_t len, size_t size)
{
BOOL rc = FALSE;
void* copy = NULL;
void* copy = nullptr;
void* old = freerdp_settings_get_pointer_writable(settings, id);
free(old);
if (!freerdp_settings_set_pointer(settings, id, NULL))
if (!freerdp_settings_set_pointer(settings, id, nullptr))
return FALSE;
if (lenId != FreeRDP_UINT32_UNUSED)
{
@@ -1509,25 +1509,25 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
case FreeRDP_TargetNetAddresses:
if (!freerdp_target_net_addresses_resize(settings, len))
return FALSE;
if (data == NULL)
if (data == nullptr)
target_net_addresses_free(settings, 0);
return TRUE;
case FreeRDP_ServerLicenseProductIssuers:
if (data == NULL)
if (data == nullptr)
freerdp_server_license_issuers_free(settings);
return freerdp_settings_set_pointer_len_(
settings, id, FreeRDP_ServerLicenseProductIssuersCount, data, len, sizeof(char*));
case FreeRDP_TargetNetPorts:
if (!freerdp_target_net_addresses_resize(settings, len))
return FALSE;
if (data == NULL)
if (data == nullptr)
{
for (size_t x = 0; x < len; x++)
settings->TargetNetPorts[x] = 0;
}
return TRUE;
case FreeRDP_DeviceArray:
if (data == NULL)
if (data == nullptr)
freerdp_device_collection_free(settings);
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_DeviceArraySize, data,
len, sizeof(RDPDR_DEVICE*));
@@ -1576,19 +1576,19 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_UINT32_UNUSED, data, len,
sizeof(GLYPH_CACHE_DEFINITION));
case FreeRDP_StaticChannelArray:
if (data == NULL)
if (data == nullptr)
freerdp_static_channel_collection_free(settings);
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_StaticChannelArraySize,
data, len, sizeof(ADDIN_ARGV*));
case FreeRDP_DynamicChannelArray:
if (data == NULL)
if (data == nullptr)
freerdp_dynamic_channel_collection_free(settings);
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_DynamicChannelArraySize,
data, len, sizeof(ADDIN_ARGV*));
case FreeRDP_ReceivedCapabilityData:
if (!freerdp_capability_buffer_resize(settings, len, FALSE))
return FALSE;
if (data == NULL)
if (data == nullptr)
{
freerdp_capability_data_free(settings, 0, FALSE);
}
@@ -1596,7 +1596,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
case FreeRDP_ReceivedCapabilities:
if (!freerdp_capability_buffer_resize(settings, len, FALSE))
return FALSE;
if (data == NULL)
if (data == nullptr)
{
for (size_t x = 0; x < settings->ReceivedCapabilitiesSize; x++)
{
@@ -1615,7 +1615,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
case FreeRDP_ReceivedCapabilityDataSizes:
if (!freerdp_capability_buffer_resize(settings, len, FALSE))
return FALSE;
if (data == NULL)
if (data == nullptr)
{
for (size_t x = 0; x < settings->ReceivedCapabilitiesSize; x++)
settings->ReceivedCapabilityDataSizes[x] = 0;
@@ -1626,9 +1626,9 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke
return freerdp_settings_set_pointer_len_(settings, id, FreeRDP_Password51Length, data,
len, sizeof(char));
default:
if ((data == NULL) && (len == 0))
if ((data == nullptr) && (len == 0))
{
freerdp_settings_set_pointer(settings, id, NULL);
freerdp_settings_set_pointer(settings, id, nullptr);
}
else
WLog_WARN(TAG, "Invalid id %d", id);
@@ -1641,7 +1641,7 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings,
{
size_t max = 0;
if (!settings)
return NULL;
return nullptr;
switch (id)
{
case FreeRDP_ClientAutoReconnectCookie:
@@ -1789,13 +1789,13 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings,
return &settings->ReceivedCapabilityDataSizes[offset];
default:
WLog_WARN(TAG, "Invalid id %s [%d]", freerdp_settings_get_name_for_key(id), id);
return NULL;
return nullptr;
}
fail:
WLog_WARN(TAG, "Invalid offset for %s [%d]: size=%" PRIuz ", offset=%" PRIuz,
freerdp_settings_get_name_for_key(id), id, max, offset);
return NULL;
return nullptr;
}
BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_Keys_Pointer id,
@@ -1838,7 +1838,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_
WINPR_ASSERT(settings->TargetNetAddresses);
free(settings->TargetNetAddresses[offset]);
settings->TargetNetAddresses[offset] = _strdup((const char*)data);
return settings->TargetNetAddresses[offset] != NULL;
return settings->TargetNetAddresses[offset] != nullptr;
case FreeRDP_TargetNetPorts:
maxOffset = freerdp_settings_get_uint32(settings, FreeRDP_TargetNetAddressCount);
if ((offset >= maxOffset) || !data)
@@ -1955,7 +1955,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_
if ((offset >= maxOffset) || !settings->ServerLicenseProductIssuers)
goto fail;
free(settings->ServerLicenseProductIssuers[offset]);
settings->ServerLicenseProductIssuers[offset] = NULL;
settings->ServerLicenseProductIssuers[offset] = nullptr;
if (data)
settings->ServerLicenseProductIssuers[offset] = _strdup((const char*)data);
return TRUE;
@@ -1980,7 +1980,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_
}
fail:
WLog_WARN(TAG, "[%s] Invalid offset=%" PRIuz " [%" PRIuz "] or NULL data=%p",
WLog_WARN(TAG, "[%s] Invalid offset=%" PRIuz " [%" PRIuz "] or nullptr data=%p",
freerdp_settings_get_name_for_key(id), offset, maxOffset, data);
return FALSE;
}
@@ -2244,7 +2244,7 @@ BOOL freerdp_settings_set_string_from_utf16(rdpSettings* settings, FreeRDP_Setti
WINPR_ASSERT(settings);
if (!param)
return freerdp_settings_set_string_copy_(settings, id, NULL, 0, TRUE);
return freerdp_settings_set_string_copy_(settings, id, nullptr, 0, TRUE);
size_t len = 0;
@@ -2263,7 +2263,7 @@ BOOL freerdp_settings_set_string_from_utf16N(rdpSettings* settings, FreeRDP_Sett
WINPR_ASSERT(settings);
if (!param)
return freerdp_settings_set_string_copy_(settings, id, NULL, length, TRUE);
return freerdp_settings_set_string_copy_(settings, id, nullptr, length, TRUE);
char* str = ConvertWCharNToUtf8Alloc(param, length, &len);
if (!str && (length != 0))
@@ -2285,7 +2285,7 @@ WCHAR* freerdp_settings_get_string_as_utf16(const rdpSettings* settings,
if (pCharLen)
*pCharLen = 0;
if (!str)
return NULL;
return nullptr;
return ConvertUtf8ToWCharAlloc(str, pCharLen);
}
@@ -2386,7 +2386,7 @@ BOOL freerdp_settings_append_string(rdpSettings* settings, FreeRDP_Settings_Keys
const char* old = freerdp_settings_get_string(settings, id);
size_t len = 0;
char* str = NULL;
char* str = nullptr;
if (!old)
winpr_asprintf(&str, &len, "%s", param);
@@ -2402,7 +2402,7 @@ BOOL freerdp_settings_append_string(rdpSettings* settings, FreeRDP_Settings_Keys
BOOL freerdp_settings_are_valid(const rdpSettings* settings)
{
return settings != NULL;
return settings != nullptr;
}
/* Function to sort rdpMonitor arrays:
@@ -2439,13 +2439,13 @@ BOOL freerdp_settings_set_monitor_def_array_sorted(rdpSettings* settings,
return FALSE;
if (!freerdp_settings_set_int32(settings, FreeRDP_MonitorLocalShiftY, 0))
return FALSE;
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, 0))
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, 0))
return FALSE;
return freerdp_settings_set_uint32(settings, FreeRDP_MonitorCount, 0);
}
// Find primary or alternatively the monitor at 0/0
const rdpMonitor* primary = NULL;
const rdpMonitor* primary = nullptr;
for (size_t x = 0; x < count; x++)
{
const rdpMonitor* cur = &monitors[x];
@@ -2474,7 +2474,7 @@ BOOL freerdp_settings_set_monitor_def_array_sorted(rdpSettings* settings,
return FALSE;
}
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, nullptr, count))
return FALSE;
rdpMonitor* sorted = freerdp_settings_get_pointer_writable(settings, FreeRDP_MonitorDefArray);
WINPR_ASSERT(sorted);
@@ -2556,7 +2556,7 @@ static WINPR_JSON* json_from_addin_item(const ADDIN_ARGV* val)
{
const char* str = val->argv[x];
WINPR_JSON* item = NULL;
WINPR_JSON* item = nullptr;
if (!str)
{
item = WINPR_JSON_CreateNull();
@@ -2574,7 +2574,7 @@ static WINPR_JSON* json_from_addin_item(const ADDIN_ARGV* val)
fail:
WINPR_JSON_Delete(obj);
return NULL;
return nullptr;
}
static BOOL json_from_addin_item_array(WINPR_JSON* json, const rdpSettings* settings,
@@ -2595,7 +2595,7 @@ static BOOL json_from_addin_item_array(WINPR_JSON* json, const rdpSettings* sett
static BOOL add_string_or_null(WINPR_JSON* json, const char* key, const char* value)
{
if (value)
return WINPR_JSON_AddStringToObject(json, key, value) != NULL;
return WINPR_JSON_AddStringToObject(json, key, value) != nullptr;
(void)WINPR_JSON_AddNullToObject(json, key);
return TRUE;
@@ -2663,7 +2663,7 @@ static WINPR_JSON* json_from_device_item(const RDPDR_DEVICE* val)
fail:
WINPR_JSON_Delete(obj);
return NULL;
return nullptr;
}
static BOOL json_from_device_item_array(WINPR_JSON* json, const rdpSettings* settings,
@@ -2688,7 +2688,7 @@ static BOOL string_array_to_json(WINPR_JSON* json, const rdpSettings* settings,
{
const char* cval = freerdp_settings_get_pointer_array(settings, key, x);
WINPR_JSON* item = NULL;
WINPR_JSON* item = nullptr;
if (!cval)
item = WINPR_JSON_CreateNull();
else
@@ -2702,19 +2702,19 @@ static BOOL string_array_to_json(WINPR_JSON* json, const rdpSettings* settings,
static BOOL wchar_to_json(WINPR_JSON* obj, const char* key, const WCHAR* wstr, size_t len)
{
if (len == 0)
return WINPR_JSON_AddStringToObject(obj, key, "") != NULL;
return WINPR_JSON_AddStringToObject(obj, key, "") != nullptr;
const size_t slen = len * 6;
char* str = calloc(1, slen);
if (!str)
return FALSE;
WINPR_JSON* jstr = NULL;
WINPR_JSON* jstr = nullptr;
SSIZE_T rc = ConvertWCharNToUtf8(wstr, len, str, slen);
if (rc >= 0)
jstr = WINPR_JSON_AddStringToObject(obj, key, str);
free(str);
return jstr != NULL;
return jstr != nullptr;
}
static BOOL wchar_from_json(WCHAR* wstr, size_t len, const WINPR_JSON* obj, const char* key)
@@ -2814,7 +2814,7 @@ static WINPR_JSON* systemtime_to_json(WINPR_JSON* parent, const char* key, const
WINPR_JSON* obj = WINPR_JSON_AddObjectToObject(parent, key);
if (!obj)
return NULL;
return nullptr;
if (!WINPR_JSON_AddNumberToObject(obj, "wYear", st->wYear))
goto fail;
@@ -2836,7 +2836,7 @@ static WINPR_JSON* systemtime_to_json(WINPR_JSON* parent, const char* key, const
return obj;
fail:
WINPR_JSON_Delete(obj);
return NULL;
return nullptr;
}
static BOOL systemtime_from_json(const WINPR_JSON* pobj, const char* key, SYSTEMTIME* st)
@@ -2896,7 +2896,7 @@ static BOOL ts_info_array_from_json(rdpSettings* settings, FreeRDP_Settings_Keys
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, key, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -2998,7 +2998,7 @@ static BOOL glyph_cache_def_array_from_json(rdpSettings* settings, FreeRDP_Setti
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3039,7 +3039,7 @@ static BOOL bitmap_cache_v2_array_from_json(rdpSettings* settings, FreeRDP_Setti
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3093,7 +3093,7 @@ static BOOL client_cookie_array_from_json(rdpSettings* settings, FreeRDP_Setting
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3144,7 +3144,7 @@ static BOOL server_cookie_array_from_json(rdpSettings* settings, FreeRDP_Setting
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3191,7 +3191,7 @@ static BOOL channel_def_array_from_json(rdpSettings* settings, FreeRDP_Settings_
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3257,7 +3257,7 @@ static BOOL monitor_def_array_from_json(rdpSettings* settings, FreeRDP_Settings_
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, id, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, count))
return FALSE;
for (size_t x = 0; x < count; x++)
@@ -3630,7 +3630,7 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json,
case FreeRDP_RedirectionTargetCertificate:
case FreeRDP_RdpServerCertificate:
{
WINPR_JSON* item = NULL;
WINPR_JSON* item = nullptr;
size_t len = 0;
char* pem = freerdp_certificate_get_pem(val, &len);
if (pem)
@@ -3647,9 +3647,9 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json,
}
case FreeRDP_RdpServerRsaKey:
{
WINPR_JSON* item = NULL;
WINPR_JSON* item = nullptr;
size_t len = 0;
char* pem = freerdp_key_get_pem(val, &len, NULL);
char* pem = freerdp_key_get_pem(val, &len, nullptr);
if (pem)
item = WINPR_JSON_CreateString(pem);
free(pem);
@@ -3683,17 +3683,17 @@ static BOOL serialize_pointer(const rdpSettings* settings, WINPR_JSON* json,
char* freerdp_settings_serialize(const rdpSettings* settings, BOOL pretty, size_t* plength)
{
char* str = NULL;
char* str = nullptr;
if (plength)
*plength = 0;
if (!settings)
return NULL;
return nullptr;
WINPR_JSON* json = WINPR_JSON_CreateObject();
if (!json)
return NULL;
return nullptr;
WINPR_JSON* jbool = WINPR_JSON_AddObjectToObject(
json, freerdp_settings_get_type_name_for_type(RDP_SETTINGS_TYPE_BOOL));
@@ -3830,19 +3830,19 @@ static BOOL val_from_array(rdpSettings* settings, const WINPR_JSON* json,
FreeRDP_Settings_Keys_Pointer key, size_t esize)
{
if (WINPR_JSON_IsNull(json))
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
if (!WINPR_JSON_IsArray(json))
return FALSE;
size_t len = WINPR_JSON_GetArraySize(json);
if (len == 0)
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
size_t count = len / esize;
if (count * esize != len)
return FALSE;
if (!freerdp_settings_set_pointer_len(settings, key, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, count))
return FALSE;
BYTE* data = freerdp_settings_get_pointer_writable(settings, key);
@@ -3870,7 +3870,7 @@ static BOOL uintptr_from_array(rdpSettings* settings, const WINPR_JSON* json)
return FALSE;
if (len == 0)
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
union
{
@@ -3894,14 +3894,14 @@ static BOOL val_from_uint32_array(rdpSettings* settings, const WINPR_JSON* json,
FreeRDP_Settings_Keys_UInt32 keyId)
{
if (WINPR_JSON_IsNull(json))
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
if (!WINPR_JSON_IsArray(json))
return FALSE;
const size_t len = WINPR_JSON_GetArraySize(json);
if ((FreeRDP_UINT32_UNUSED != keyId) && (freerdp_settings_get_uint32(settings, keyId) != len))
{
if (!freerdp_settings_set_pointer_len(settings, key, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len))
return FALSE;
}
@@ -3927,7 +3927,7 @@ static BOOL caps_data_entry_from_json(rdpSettings* settings, size_t offset, cons
if (size == 0)
{
return freerdp_settings_set_pointer_array(settings, FreeRDP_ReceivedCapabilityData, offset,
NULL);
nullptr);
}
uint8_t* data = calloc(size, sizeof(uint8_t));
@@ -3957,7 +3957,7 @@ static BOOL caps_data_array_from_json(rdpSettings* settings, const WINPR_JSON* j
return FALSE;
const size_t count = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ReceivedCapabilityData, NULL, count))
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_ReceivedCapabilityData, nullptr, count))
return FALSE;
for (uint32_t x = 0; x < count; x++)
@@ -3973,12 +3973,12 @@ static BOOL str_array_from_json(rdpSettings* settings, const WINPR_JSON* json,
FreeRDP_Settings_Keys_Pointer key)
{
if (WINPR_JSON_IsNull(json))
return freerdp_settings_set_pointer_len(settings, key, NULL, 0);
return freerdp_settings_set_pointer_len(settings, key, nullptr, 0);
if (!WINPR_JSON_IsArray(json))
return FALSE;
size_t len = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, key, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len))
return FALSE;
for (size_t x = 0; x < len; x++)
@@ -4000,13 +4000,13 @@ static BOOL addin_argv_from_json(rdpSettings* settings, const WINPR_JSON* json,
FreeRDP_Settings_Keys_Pointer key)
{
if (WINPR_JSON_IsNull(json))
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
if (!WINPR_JSON_IsArray(json))
return FALSE;
size_t len = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, key, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len))
return FALSE;
for (size_t x = 0; x < len; x++)
@@ -4061,7 +4061,7 @@ static char* get_string(const WINPR_JSON* json, const char* key)
{
WINPR_JSON* item = WINPR_JSON_GetObjectItemCaseSensitive(json, key);
if (!item || !WINPR_JSON_IsString(item))
return NULL;
return nullptr;
const char* str = WINPR_JSON_GetStringValue(item);
return WINPR_CAST_CONST_PTR_AWAY(str, char*);
}
@@ -4131,13 +4131,13 @@ static BOOL device_array_from_json(rdpSettings* settings, const WINPR_JSON* json
FreeRDP_Settings_Keys_Pointer key)
{
if (WINPR_JSON_IsNull(json))
return freerdp_settings_set_pointer(settings, key, NULL);
return freerdp_settings_set_pointer(settings, key, nullptr);
if (!WINPR_JSON_IsArray(json))
return FALSE;
size_t len = WINPR_JSON_GetArraySize(json);
if (!freerdp_settings_set_pointer_len(settings, key, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, key, nullptr, len))
return FALSE;
for (size_t x = 0; x < len; x++)
@@ -4159,20 +4159,20 @@ static const char* pem_from_json(const WINPR_JSON* jval, size_t* plen, BOOL* pva
*plen = 0;
if (WINPR_JSON_IsNull(jval))
return NULL;
return nullptr;
size_t len = WINPR_JSON_GetArraySize(jval);
if (len == 0)
{
*pvalid = TRUE;
return NULL;
return nullptr;
}
WINPR_JSON* item = WINPR_JSON_GetArrayItem(jval, 0);
if (!item)
return NULL;
return nullptr;
if (!WINPR_JSON_IsString(item))
return NULL;
return nullptr;
*plen = len;
*pvalid = TRUE;
@@ -4244,10 +4244,10 @@ static BOOL deserialize_pointer(const WINPR_JSON* json, rdpSettings* settings,
const char* pem = pem_from_json(jval, &len, &valid);
if (!valid)
return FALSE;
if (!freerdp_settings_set_pointer_len(settings, id, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, len))
return FALSE;
rdpCertificate* cert = NULL;
rdpCertificate* cert = nullptr;
if (!pem)
return TRUE;
@@ -4266,12 +4266,12 @@ static BOOL deserialize_pointer(const WINPR_JSON* json, rdpSettings* settings,
const char* pem = pem_from_json(jval, &len, &valid);
if (!valid)
return FALSE;
if (!freerdp_settings_set_pointer_len(settings, id, NULL, len))
if (!freerdp_settings_set_pointer_len(settings, id, nullptr, len))
return FALSE;
if (!pem)
return TRUE;
rdpPrivateKey* key = freerdp_key_new_from_pem_enc(pem, NULL);
rdpPrivateKey* key = freerdp_key_new_from_pem_enc(pem, nullptr);
if (!key)
return FALSE;
return freerdp_settings_set_pointer_len(settings, id, key, 1);
@@ -4291,7 +4291,7 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length)
{
WINPR_JSON* json = WINPR_JSON_ParseWithLength(jstr, length);
if (!json)
return NULL;
return nullptr;
WINPR_JSON* jbool = WINPR_JSON_GetObjectItemCaseSensitive(
json, freerdp_settings_get_type_name_for_type(RDP_SETTINGS_TYPE_BOOL));
@@ -4443,7 +4443,7 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length)
break;
case RDP_SETTINGS_TYPE_STRING:
{
const char* val = NULL;
const char* val = nullptr;
WINPR_JSON* item = WINPR_JSON_GetObjectItemCaseSensitive(jstring, name);
if (item && !WINPR_JSON_IsNull(item))
{
@@ -4469,5 +4469,5 @@ rdpSettings* freerdp_settings_deserialize(const char* jstr, size_t length)
fail:
freerdp_settings_free(settings);
WINPR_JSON_Delete(json);
return NULL;
return nullptr;
}

16
libfreerdp/common/settings_getters.c
View File

@@ -15,7 +15,7 @@ static void free_string(char** current, BOOL cleanup)
if (*current)
memset(*current, 0, strlen(*current));
free(*current);
(*current) = NULL;
(*current) = nullptr;
}
}
@@ -24,7 +24,7 @@ static BOOL alloc_empty_string(char** current, const char* next, size_t next_len
if (!next && (next_len > 0))
{
*current = calloc(next_len, 1);
return (*current != NULL);
return (*current != nullptr);
}
return FALSE;
}
@@ -36,8 +36,8 @@ static BOOL update_string_copy_(char** current, const char* next, size_t next_le
if (alloc_empty_string(current, next, next_len))
return TRUE;
*current = (next ? strndup(next, next_len) : NULL);
return !next || (*current != NULL);
*current = (next ? strndup(next, next_len) : nullptr);
return !next || (*current != nullptr);
}
static BOOL update_string_(char** current, char* next, size_t next_len)
@@ -48,7 +48,7 @@ static BOOL update_string_(char** current, char* next, size_t next_len)
return TRUE;
*current = next;
return !next || (*current != NULL);
return !next || (*current != nullptr);
}
BOOL freerdp_settings_get_bool(WINPR_ATTR_UNUSED const rdpSettings* settings,
@@ -3041,7 +3041,7 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set
WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
WINPR_ASSERT(FALSE);
return NULL;
return nullptr;
}
}
@@ -3373,7 +3373,7 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin
WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
WINPR_ASSERT(FALSE);
return NULL;
return nullptr;
}
}
@@ -4188,7 +4188,7 @@ void* freerdp_settings_get_pointer_writable(rdpSettings* settings, FreeRDP_Setti
WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id),
freerdp_settings_get_type_name_for_key(id));
WINPR_ASSERT(FALSE);
return NULL;
return nullptr;
}
}

10
libfreerdp/common/settings_str.c
View File

@@ -335,12 +335,12 @@ void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup)
switch (cur->type)
{
case FREERDP_SETTINGS_TYPE_STRING: /* strings */
freerdp_settings_set_string_copy_(dst, (FreeRDP_Settings_Keys_String)cur->id, NULL,
0, cleanup);
freerdp_settings_set_string_copy_(dst, (FreeRDP_Settings_Keys_String)cur->id,
nullptr, 0, cleanup);
break;
case FREERDP_SETTINGS_TYPE_POINTER: /* pointer */
freerdp_settings_set_pointer_len(dst, (FreeRDP_Settings_Keys_Pointer)cur->id, NULL,
0);
freerdp_settings_set_pointer_len(dst, (FreeRDP_Settings_Keys_Pointer)cur->id,
nullptr, 0);
break;
default:
break;
@@ -426,7 +426,7 @@ const char* freerdp_settings_get_name_for_key(SSIZE_T key)
if (cur->id == key)
return cur->str;
}
return NULL;
return nullptr;
}
BOOL freerdp_settings_copy_item(rdpSettings* dst, const rdpSettings* src, SSIZE_T id)

62
libfreerdp/common/test/TestAddinArgv.c
View File

@@ -7,14 +7,14 @@ static BOOL test_alloc(void)
{
BOOL rc = FALSE;
int rng = 0;
const char* param[] = { "foo:", "bar", "bla", "rdp", NULL };
ADDIN_ARGV* arg1 = NULL;
ADDIN_ARGV* arg2 = NULL;
ADDIN_ARGV* arg3 = NULL;
ADDIN_ARGV* arg4 = NULL;
const char* param[] = { "foo:", "bar", "bla", "rdp", nullptr };
ADDIN_ARGV* arg1 = nullptr;
ADDIN_ARGV* arg2 = nullptr;
ADDIN_ARGV* arg3 = nullptr;
ADDIN_ARGV* arg4 = nullptr;
/* Test empty allocation */
arg1 = freerdp_addin_argv_new(0, NULL);
arg1 = freerdp_addin_argv_new(0, nullptr);
if (!arg1 || (arg1->argc != 0) || (arg1->argv))
goto fail;
@@ -22,7 +22,7 @@ static BOOL test_alloc(void)
winpr_RAND(&rng, sizeof(rng));
rng = abs(rng % 8192) + 1;
arg2 = freerdp_addin_argv_new(rng, NULL);
arg2 = freerdp_addin_argv_new(rng, nullptr);
if (!arg2 || (arg2->argc != rng) || (!arg2->argv))
goto fail;
for (int x = 0; x < arg2->argc; x++)
@@ -42,7 +42,7 @@ static BOOL test_alloc(void)
goto fail;
}
/* Input lists with NULL elements are not allowed */
/* Input lists with nullptr elements are not allowed */
arg4 = freerdp_addin_argv_new(ARRAYSIZE(param), param);
if (arg4)
goto fail;
@@ -60,9 +60,9 @@ static BOOL test_clone(void)
{
BOOL rc = FALSE;
const char* param[] = { "foo:", "bar", "bla", "rdp" };
ADDIN_ARGV* arg = NULL;
ADDIN_ARGV* clone = NULL;
ADDIN_ARGV* clone2 = NULL;
ADDIN_ARGV* arg = nullptr;
ADDIN_ARGV* clone = nullptr;
ADDIN_ARGV* clone2 = nullptr;
arg = freerdp_addin_argv_new(ARRAYSIZE(param), param);
if (!arg || (arg->argc != ARRAYSIZE(param)))
@@ -79,7 +79,7 @@ static BOOL test_clone(void)
goto fail;
}
clone2 = freerdp_addin_argv_clone(NULL);
clone2 = freerdp_addin_argv_clone(nullptr);
if (clone2)
goto fail;
rc = TRUE;
@@ -95,7 +95,7 @@ static BOOL test_add_remove(void)
{
const char* args[] = { "foo", "bar", "bla", "gaga" };
BOOL rc = FALSE;
ADDIN_ARGV* arg = freerdp_addin_argv_new(0, NULL);
ADDIN_ARGV* arg = freerdp_addin_argv_new(0, nullptr);
if (!arg || (arg->argc != 0) || arg->argv)
goto fail;
@@ -117,11 +117,11 @@ static BOOL test_add_remove(void)
goto fail;
/* Invalid parameters, must return FALSE */
if (freerdp_addin_argv_del_argument(NULL, "foobar"))
if (freerdp_addin_argv_del_argument(nullptr, "foobar"))
goto fail;
/* Invalid parameters, must return FALSE */
if (freerdp_addin_argv_del_argument(arg, NULL))
if (freerdp_addin_argv_del_argument(arg, nullptr))
goto fail;
/* Remove elements one by one to test argument index move */
@@ -149,17 +149,17 @@ static BOOL test_set_argument(void)
const char* newarg = "foobar";
const char* args[] = { "foo", "bar", "bla", "gaga" };
BOOL rc = FALSE;
ADDIN_ARGV* arg = NULL;
ADDIN_ARGV* arg = nullptr;
arg = freerdp_addin_argv_new(ARRAYSIZE(args), args);
if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv)
goto fail;
/* Check invalid parameters */
ret = freerdp_addin_set_argument(NULL, "foo");
ret = freerdp_addin_set_argument(nullptr, "foo");
if (ret >= 0)
goto fail;
ret = freerdp_addin_set_argument(arg, NULL);
ret = freerdp_addin_set_argument(arg, nullptr);
if (ret >= 0)
goto fail;
@@ -187,20 +187,20 @@ static BOOL test_replace_argument(void)
const char* newarg = "foobar";
const char* args[] = { "foo", "bar", "bla", "gaga" };
BOOL rc = FALSE;
ADDIN_ARGV* arg = NULL;
ADDIN_ARGV* arg = nullptr;
arg = freerdp_addin_argv_new(ARRAYSIZE(args), args);
if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv)
goto fail;
/* Check invalid parameters */
ret = freerdp_addin_replace_argument(NULL, "foo", newarg);
ret = freerdp_addin_replace_argument(nullptr, "foo", newarg);
if (ret >= 0)
goto fail;
ret = freerdp_addin_replace_argument(arg, NULL, newarg);
ret = freerdp_addin_replace_argument(arg, nullptr, newarg);
if (ret >= 0)
goto fail;
ret = freerdp_addin_replace_argument(arg, "foo", NULL);
ret = freerdp_addin_replace_argument(arg, "foo", nullptr);
if (ret >= 0)
goto fail;
@@ -232,20 +232,20 @@ static BOOL test_set_argument_value(void)
const char* fullnewvalue = "lalala:foobar";
const char* args[] = { "foo", "foo:", "bar", "bla", "gaga" };
BOOL rc = FALSE;
ADDIN_ARGV* arg = NULL;
ADDIN_ARGV* arg = nullptr;
arg = freerdp_addin_argv_new(ARRAYSIZE(args), args);
if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv)
goto fail;
/* Check invalid parameters */
ret = freerdp_addin_set_argument_value(NULL, "foo", newarg1);
ret = freerdp_addin_set_argument_value(nullptr, "foo", newarg1);
if (ret >= 0)
goto fail;
ret = freerdp_addin_set_argument_value(arg, NULL, newarg1);
ret = freerdp_addin_set_argument_value(arg, nullptr, newarg1);
if (ret >= 0)
goto fail;
ret = freerdp_addin_set_argument_value(arg, "foo", NULL);
ret = freerdp_addin_set_argument_value(arg, "foo", nullptr);
if (ret >= 0)
goto fail;
@@ -280,23 +280,23 @@ static BOOL test_replace_argument_value(void)
const char* fullnewvalue = "lalala:foobar";
const char* args[] = { "foo", "foo:", "bar", "bla", "gaga" };
BOOL rc = FALSE;
ADDIN_ARGV* arg = NULL;
ADDIN_ARGV* arg = nullptr;
arg = freerdp_addin_argv_new(ARRAYSIZE(args), args);
if (!arg || (arg->argc != ARRAYSIZE(args)) || !arg->argv)
goto fail;
/* Check invalid parameters */
ret = freerdp_addin_replace_argument_value(NULL, "bar", "foo", newarg1);
ret = freerdp_addin_replace_argument_value(nullptr, "bar", "foo", newarg1);
if (ret >= 0)
goto fail;
ret = freerdp_addin_replace_argument_value(arg, NULL, "foo", newarg1);
ret = freerdp_addin_replace_argument_value(arg, nullptr, "foo", newarg1);
if (ret >= 0)
goto fail;
ret = freerdp_addin_replace_argument_value(arg, "foo", NULL, newarg1);
ret = freerdp_addin_replace_argument_value(arg, "foo", nullptr, newarg1);
if (ret >= 0)
goto fail;
ret = freerdp_addin_replace_argument_value(arg, "bar", "foo", NULL);
ret = freerdp_addin_replace_argument_value(arg, "bar", "foo", nullptr);
if (ret >= 0)
goto fail;

12
libfreerdp/common/test/TestCommonAssistance.c
View File

@@ -210,9 +210,9 @@ static BOOL test_file_from_buffer(wLog* log, const char* data, size_t size, cons
{
BOOL rc = FALSE;
int status = 0;
char* pass = NULL;
char* expertBlob = NULL;
const char* EncryptedPassStub = NULL;
char* pass = nullptr;
char* expertBlob = nullptr;
const char* EncryptedPassStub = nullptr;
size_t EncryptedPassStubLength = 0;
rdpAssistanceFile* file = freerdp_assistance_file_new();
@@ -271,7 +271,7 @@ static BOOL test_msrsc_incident_file_type1(wLog* log)
static BOOL test_msrsc_incident_file_type2(wLog* log)
{
if (!test_file_from_buffer(log, connectionstr2, sizeof(connectionstr2),
TEST_MSRC_INCIDENT_PASSWORD_TYPE2, NULL, 0))
TEST_MSRC_INCIDENT_PASSWORD_TYPE2, nullptr, 0))
return FALSE;
if (!test_file_from_buffer(log, connectionstr3, sizeof(connectionstr3), connectionpwd3,
connectionpwd3_enc, sizeof(connectionpwd3_enc)))
@@ -286,7 +286,7 @@ static BOOL test_msrsc_incident_file_type2(wLog* log)
int TestCommonAssistance(int argc, char* argv[])
{
wLog* log = NULL;
wLog* log = nullptr;
WINPR_UNUSED(argc);
WINPR_UNUSED(argv);
log = WLog_Get(__func__);
@@ -297,7 +297,7 @@ int TestCommonAssistance(int argc, char* argv[])
const char* test = fail_tests[x];
const size_t len = strlen(test);
if (!run_test_parse(log, test, len + 1, NULL, FALSE))
if (!run_test_parse(log, test, len + 1, nullptr, FALSE))
return -1;
}

2
libfreerdp/common/test/TestFuzzCommonAssistanceHexStringToBin.c
View File

@@ -3,7 +3,7 @@
int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size)
{
char* buf = calloc(Size + 1, sizeof(char));
if (buf == NULL)
if (buf == nullptr)
return 0;
memcpy(buf, Data, Size);
buf[Size] = '\0';

2
libfreerdp/common/test/TestFuzzCommonAssistanceParseFileBuffer.c
View File

@@ -9,7 +9,7 @@ static int parse_file_buffer(const uint8_t* Data, size_t Size)
return -1;
char* buf = calloc(Size + 1, sizeof(char));
if (buf == NULL)
if (buf == nullptr)
goto err;
memcpy(buf, Data, Size);
buf[Size] = '\0';