mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-27 15:22:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parsing in _socketDeserializeHostent().

Browse Source
This commit is contained in:
yellows8 2018-05-15 02:10:13 -04:00
parent 61d4140773
commit fdf0949562
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nx/source/runtime/devices/socket.c
View File

@ -1109,6 +1109,7 @@ static struct hostent *_socketDeserializeHostent(int *err, const void *out_he_se
size_t name_size, total_aliases_size = 0; size_t name_size, total_aliases_size = 0;
size_t nb_addresses; size_t nb_addresses;
size_t nb_aliases = 0; size_t nb_aliases = 0;
size_t nb_pos;
size_t len; size_t len;
int addrtype, addrlen; int addrtype, addrlen;
@ -1118,19 +1119,24 @@ static struct hostent *_socketDeserializeHostent(int *err, const void *out_he_se
pos = buf; pos = buf;
name_size = strlen(pos) + 1; name_size = strlen(pos) + 1;
pos += name_size; pos += name_size;
nb_aliases = ntohl(*(const u32 *)pos);
pos += 4;
pos_aliases = pos; pos_aliases = pos;
for(pos = buf, len = 1; len != 0; pos += len + 1) {
len = strlen(pos); if(nb_aliases>0) {
if(len != 0) for(nb_pos=0, len = 1; nb_pos<nb_aliases; nb_pos++, pos += len + 1) {
nb_aliases++; len = strlen(pos);
}
} }
total_aliases_size = pos - pos_aliases - 1; total_aliases_size = pos - pos_aliases;
// Nintendo uses unsigned short here... // Nintendo uses unsigned short here...
addrtype = ntohl(*(const u16 *)pos); addrtype = htons(*(const u16 *)pos);
pos += 2; pos += 2;
addrlen = ntohl(*(const u16 *)pos); addrlen = htons(*(const u16 *)pos);
pos += 2; pos += 2;
// sfdnsres will only return IPv4 addresses for the "host" commands // sfdnsres will only return IPv4 addresses for the "host" commands
@ -1140,8 +1146,11 @@ static struct hostent *_socketDeserializeHostent(int *err, const void *out_he_se
} }
// The official hostent (de)serializer doesn't support IPv6, at least not currently. // The official hostent (de)serializer doesn't support IPv6, at least not currently.
nb_addresses = ntohl(*(const u32 *)pos);
pos += 4;
pos_addresses = pos; pos_addresses = pos;
for(nb_addresses = 0; ((const struct in_addr *)pos)->s_addr != 0; nb_addresses++); pos += addrlen * nb_addresses;
he = (struct hostent *)malloc( he = (struct hostent *)malloc(
sizeof(struct hostent) sizeof(struct hostent)
@ -1168,19 +1177,23 @@ static struct hostent *_socketDeserializeHostent(int *err, const void *out_he_se
memcpy(he->h_name, buf, name_size); memcpy(he->h_name, buf, name_size);
} }
char *alias = (char *)(he->h_addr_list + nb_addresses + 1); if(nb_aliases>0) {
memcpy(alias, pos_aliases, total_aliases_size); char *alias = (char *)(he->h_addr_list + nb_addresses + 1);
for(size_t i = 0; i < nb_aliases; i++) { memcpy(alias, pos_aliases, total_aliases_size);
he->h_aliases[i] = alias; for(size_t i = 0; i < nb_aliases; i++) {
alias += strlen(alias) + 1; he->h_aliases[i] = alias;
alias += strlen(alias) + 1;
}
} }
he->h_aliases[nb_aliases] = NULL; he->h_aliases[nb_aliases] = NULL;
struct in_addr *addresses = (struct in_addr *)(he->h_addr_list + nb_addresses + 1 + total_aliases_size); if(nb_addresses>0) {
memcpy(addresses, pos_addresses, addrlen * nb_addresses); struct in_addr *addresses = (struct in_addr *)(he->h_addr_list + nb_addresses + 1 + total_aliases_size);
for(size_t i = 0; i < nb_addresses; i++) { memcpy(addresses, pos_addresses, addrlen * nb_addresses);
he->h_addr_list[i] = (char *)&addresses[i]; for(size_t i = 0; i < nb_addresses; i++) {
addresses[i].s_addr = ntohl(addresses[i].s_addr); // lol Nintendo he->h_addr_list[i] = (char *)&addresses[i];
addresses[i].s_addr = ntohl(addresses[i].s_addr); // lol Nintendo
}
} }
he->h_addr_list[nb_addresses] = NULL; he->h_addr_list[nb_addresses] = NULL;