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

Replaced strtok with strtok_s

Browse Source
This commit is contained in:
akallabeth
2020-05-18 11:18:55 +02:00
parent fddda159d9
commit 7890833af8
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/X11/xf_event.c
View File

@@ -185,7 +185,8 @@ BOOL xf_event_action_script_init(xfContext* xfc)
while (fgets(buffer, sizeof(buffer), actionScript))
{
strtok(buffer, "\n");
char* context = NULL;
strtok_s(buffer, "\n", &context);
xevent = _strdup(buffer);
if (!xevent || ArrayList_Add(xfc->xevents, xevent) < 0)
@@ -253,7 +254,8 @@ static BOOL xf_event_execute_action_script(xfContext* xfc, const XEvent* event)
while (fgets(buffer, sizeof(buffer), actionScript))
{
strtok(buffer, "\n");
char* context = NULL;
strtok_s(buffer, "\n", &context);
}
pclose(actionScript);

6
client/X11/xf_keyboard.c
View File

@@ -74,7 +74,8 @@ static BOOL xf_keyboard_action_script_init(xfContext* xfc)
while (fgets(buffer, sizeof(buffer), keyScript) != NULL)
{
strtok(buffer, "\n");
char* context = NULL;
strtok_s(buffer, "\n", &context);
keyCombination = _strdup(buffer);
if (!keyCombination || ArrayList_Add(xfc->keyCombinations, keyCombination) < 0)
@@ -433,7 +434,8 @@ static int xf_keyboard_execute_action_script(xfContext* xfc, XF_MODIFIER_KEYS* m
while (fgets(buffer, sizeof(buffer), keyScript) != NULL)
{
strtok(buffer, "\n");
char* context = NULL;
strtok_s(buffer, "\n", &context);
if (strcmp(buffer, "key-local") == 0)
status = 0;

5
client/common/cmdline.c
View File

@@ -3500,8 +3500,9 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
BOOL success;
const char* name = NULL;
const char* drive = tok;
char* start = strtok(tok, "(");
char* end = strtok(NULL, ")");
char* subcontext = NULL;
char* start = strtok_s(tok, "(", &subcontext);
char* end = strtok_s(NULL, ")", &subcontext);
if (start && end)
name = end;

3
libfreerdp/crypto/tls.c
View File

@@ -1198,9 +1198,10 @@ static BOOL is_accepted_fingerprint(CryptoCert cert, const char* CertificateAcce
char* cur = strtok_s(copy, ",", &context);
while (cur)
{
char* subcontext = NULL;
BOOL equal;
char* strhash;
const char* h = strtok(cur, ":");
const char* h = strtok_s(cur, ":", &subcontext);
const char* fp;
if (!h)

5
winpr/libwinpr/smartcard/smartcard_pcsc.c
View File

@@ -2930,6 +2930,7 @@ unsigned int determineMacOSXVersion(void)
long minorVersion = 0;
long patchVersion = 0;
int count = 0;
char* context = NULL;
mib[0] = CTL_KERN;
mib[1] = KERN_OSRELEASE;
@@ -2947,7 +2948,7 @@ unsigned int determineMacOSXVersion(void)
return 0;
}
tok = strtok(kernelVersion, ".");
tok = strtok_s(kernelVersion, ".", &context);
errno = 0;
while (tok)
@@ -2979,7 +2980,7 @@ unsigned int determineMacOSXVersion(void)
break;
}
tok = strtok(NULL, ".");
tok = strtok_s(NULL, ".", &context);
count++;
}