Skip to content
Snippets Groups Projects
Commit 1c365418 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Addrss some new MSVC warnings

Check sscanf() result
Don't use deprecated function: inet_addr()
parent 1b18f682
No related branches found
No related tags found
No related merge requests found
...@@ -2864,8 +2864,7 @@ static void ctrl_thread(void* arg) ...@@ -2864,8 +2864,7 @@ static void ctrl_thread(void* arg)
memcpy(&data_addr, &ftp.client_addr, ftp.client_addr_len); memcpy(&data_addr, &ftp.client_addr, ftp.client_addr_len);
p = cmd + 5; p = cmd + 5;
SKIP_WHITESPACE(p); SKIP_WHITESPACE(p);
if (strnicmp(cmd, "PORT ", 5) == 0) { if (strnicmp(cmd, "PORT ", 5) == 0 && sscanf(p, "%u,%u,%u,%u,%hd,%hd", &h1, &h2, &h3, &h4, &p1, &p2) == 6) {
sscanf(p, "%u,%u,%u,%u,%hd,%hd", &h1, &h2, &h3, &h4, &p1, &p2);
data_addr.in.sin_family = AF_INET; data_addr.in.sin_family = AF_INET;
data_addr.in.sin_addr.s_addr = htonl((h1 << 24) | (h2 << 16) | (h3 << 8) | h4); data_addr.in.sin_addr.s_addr = htonl((h1 << 24) | (h2 << 16) | (h3 << 8) | h4);
data_port = (p1 << 8) | p2; data_port = (p1 << 8) | p2;
...@@ -2887,7 +2886,7 @@ static void ctrl_thread(void* arg) ...@@ -2887,7 +2886,7 @@ static void ctrl_thread(void* arg)
FIND_CHAR(p, delim); FIND_CHAR(p, delim);
old_char = *p; old_char = *p;
*p = 0; *p = 0;
data_addr.in.sin_addr.s_addr = inet_addr(ap); data_addr.in.sin_addr.s_addr = parseIPv4Address(ap);
*p = old_char; *p = old_char;
if (*p) if (*p)
p++; p++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment