generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 65dd8582: Fix alignment after variable-length data.

Browse Source 
* commit '65dd858239c4e32a5a1afbc14ac30dbcdd2a50a3':
  Fix alignment after variable-length data.
This commit is contained in:
Elliott Hughes
2015-07-06 22:32:06 +00:00
committed by Android Git Automerger
parent 4059fcd29b 65dd858239
commit a6441ac5bf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/dns/net/gethnamaddr.c
View File

@@ -640,6 +640,9 @@ android_read_hostent(FILE* proxy, struct hostent* hp, char* hbuf, size_t hbuflen
ptr += size; ptr += size;
} }
// Fix alignment after variable-length data.
ptr = (char*)ALIGN(ptr);
int aliases_len = ((int)(aliases - aliases_ptrs) + 1) * sizeof(*hp->h_aliases); int aliases_len = ((int)(aliases - aliases_ptrs) + 1) * sizeof(*hp->h_aliases);
if (ptr + aliases_len > hbuf_end) { if (ptr + aliases_len > hbuf_end) {
goto nospc; goto nospc;
@@ -674,6 +677,9 @@ android_read_hostent(FILE* proxy, struct hostent* hp, char* hbuf, size_t hbuflen
ptr += size; ptr += size;
} }
// Fix alignment after variable-length data.
ptr = (char*)ALIGN(ptr);
int addrs_len = ((int)(addr_p - addr_ptrs) + 1) * sizeof(*hp->h_addr_list); int addrs_len = ((int)(addr_p - addr_ptrs) + 1) * sizeof(*hp->h_addr_list);
if (ptr + addrs_len > hbuf_end) { if (ptr + addrs_len > hbuf_end) {
goto nospc; goto nospc;