ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6524 from forGGe/fix_address_parsing_ 

Fix IPv4 address parsing due to not-so-portable scanf modifier
pull/6561/head
Martin Kojtal 2018-04-06 12:26:37 +02:00 committed by GitHub
parent f331ac34c4 bd47110554
commit f5385e7a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/netsocket/SocketAddress.cpp
View File

@ -66,13 +66,15 @@ static void ipv4_from_address(uint8_t *bytes, const char *addr)
int i = 0;
for (; count < NSAPI_IPv4_BYTES; count++) {
unsigned char b;
int scanned = sscanf(&addr[i], "%hhu", &b);
unsigned d;
// Not using %hh, since it might be missing in newlib-based toolchains.
// See also: https://git.io/vxiw5
int scanned = sscanf(&addr[i], "%u", &d);
if (scanned < 1) {
return;
}
bytes[count] = b;
bytes[count] = static_cast<uint8_t>(d);
for (; addr[i] != '.'; i++) {
if (!addr[i]) {