diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-05-04 10:05:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-05-04 10:05:57 +0000 |
| commit | 2a0a747e57ec96bab9d4a6b7c0b32df82a41316e (patch) | |
| tree | 002d92f89d7109abc1c2ebe7f113f8dee0dc3034 /nss | |
| parent | af5726aed8a0c87d7f29570641cf0acb6a92f918 (diff) | |
Updated to fedora-glibc-20070504T0917cvs/fedora-glibc-2_5_90-22
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss_files/files-hosts.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index 6daafdeeed..7b7aadeaab 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -1,5 +1,6 @@ /* Hosts file parser in nss_files module. - Copyright (C) 1996-2001, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2003, 2004, 2006, 2007 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -102,6 +103,10 @@ _nss_files_get##name##_r (proto, \ { \ enum nss_status status; \ \ + uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct hostent_data); \ + buffer += pad; \ + buflen = buflen > pad ? buflen - pad : 0; \ + \ __libc_lock_lock (lock); \ \ /* Reset file pointer to beginning or open file. */ \ @@ -122,7 +127,8 @@ _nss_files_get##name##_r (proto, \ { \ /* We have to get all host entries from the file. */ \ const size_t tmp_buflen = MIN (buflen, 4096); \ - char tmp_buffer[tmp_buflen]; \ + char tmp_buffer[tmp_buflen] \ + __attribute__ ((__aligned__ (__alignof__ (struct hostent_data))));\ struct hostent tmp_result_buf; \ int naddrs = 1; \ int naliases = 0; \ |