qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(send_vc): Fix use of unaligned address. Properly handle partial reads.

This commit is contained in:
Ulrich Drepper 2008-10-06 16:29:06 +00:00
parent 6ba25fcbf5
commit e39e69467e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resolv/res_send.c
View File

@ -734,11 +734,11 @@ send_vc(res_state statp,
*/ */
int recvresp1 = 0; int recvresp1 = 0;
int recvresp2 = buf2 == NULL; int recvresp2 = buf2 == NULL;
read_len:
cp = ans;
uint16_t rlen16; uint16_t rlen16;
read_len:
cp = (u_char *)&rlen16;
len = sizeof(rlen16); len = sizeof(rlen16);
while ((n = TEMP_FAILURE_RETRY (read(statp->_vcsock, &rlen16, while ((n = TEMP_FAILURE_RETRY (read(statp->_vcsock, cp,
(int)len))) > 0) { (int)len))) > 0) {
cp += n; cp += n;
if ((len -= n) <= 0) if ((len -= n) <= 0)
@ -778,8 +778,16 @@ send_vc(res_state statp,
/* No buffer allocated for the first /* No buffer allocated for the first
reply. We can try to use the rest reply. We can try to use the rest
of the user-provided buffer. */ of the user-provided buffer. */
#ifdef _STRING_ARCH_unaligned
*anssizp2 = orig_anssizp - resplen; *anssizp2 = orig_anssizp - resplen;
*ansp2 = *ansp + resplen; *ansp2 = *ansp + resplen;
#else
int aligned_resplen
= ((resplen + __alignof__ (HEADER) - 1)
& (__alignof__ (HEADER) - 1));
*anssizp2 = orig_anssizp - aligned_resplen;
*ansp2 = *ansp + aligned_resplen;
#endif
} else { } else {
/* The first reply did not fit into the /* The first reply did not fit into the
user-provided buffer. Maybe the second user-provided buffer. Maybe the second