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

Update.

This commit is contained in:
Ulrich Drepper 1999-07-09 22:04:10 +00:00
parent ae3c157102
commit fbb802fc7d
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -17,11 +17,6 @@
* pwd/Versions (getpwent_r, getpwuid_r): Likewise. * pwd/Versions (getpwent_r, getpwuid_r): Likewise.
* shadow/Versions (getspent_r, getspnam_r): Likewise. * shadow/Versions (getspent_r, getspnam_r): Likewise.
1999-07-09 Cristian Gafton <gafton@redhat.com>
* nscd/nscd_gethst_r.c (nscd_gethst_r): Make sure
resultbuf->h_addr_list addresses are correctly aligned.
1999-07-09 Ulrich Drepper <drepper@cygnus.com> 1999-07-09 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/bits/string.h (__memcpy_c): Help some stupid old * sysdeps/i386/bits/string.h (__memcpy_c): Help some stupid old

8
nscd/nscd_gethst_r.c
View File

@ -182,7 +182,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
align2 = ((__alignof__ (char *) - ((cp + align1 + hst_resp.h_name_len) align2 = ((__alignof__ (char *) - ((cp + align1 + hst_resp.h_name_len)
- ((char *) 0))) - ((char *) 0)))
& (__alignof__ (char *) - 1)); & (__alignof__ (char *) - 1));
if (buflen < (align1 + hst_resp.h_name_len + align2 + if (buflen < (align1 + hst_resp.h_name_len + align2
+ ((hst_resp.h_aliases_cnt + hst_resp.h_addr_list_cnt + 2) + ((hst_resp.h_aliases_cnt + hst_resp.h_addr_list_cnt + 2)
* sizeof (char *)) * sizeof (char *))
+ hst_resp.h_addr_list_cnt * (type == AF_INET + hst_resp.h_addr_list_cnt * (type == AF_INET
@ -214,12 +214,6 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
+ hst_resp.h_aliases_cnt * sizeof (size_t)); + hst_resp.h_aliases_cnt * sizeof (size_t));
n = 2; n = 2;
/* These things must be aligned or ntohl will cause havoc. */
align = ((__alignof__ (char *) - (cp - ((char *) 0)))
& (__alignof__ (char *) - 1));
cp += align;
if (type == GETHOSTBYADDR || type == GETHOSTBYNAME) if (type == GETHOSTBYADDR || type == GETHOSTBYNAME)
{ {
vec[2].iov_base = cp; vec[2].iov_base = cp;