summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-03-16 01:10:29 +0000
committerUlrich Drepper <drepper@redhat.com>2001-03-16 01:10:29 +0000
commit328c5f650ffcdc8f10e4ebd6f741ad0b8e6ea1c1 (patch)
tree1fddc1969e068ef5e59f75c8ad685804b8685c2f /sysdeps/unix/sysv/linux/cmsg_nxthdr.c
parent3bf927cbce1d0829b587f5f0eee744e907921c58 (diff)
Update.
* timezone/antarctica: Update from tzdata2001a. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/etcetera: Likewise. * timezone/europe: Likewise. * timezone/leapseconds: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/systemv: Likewise. * timezone/yearistype: Likewise. * timezone/zone.tab: Likewise. * timezone/tzdump.c: Update from tzcode2001a. 2001-03-15 H.J. Lu <hjl@gnu.org> * intl/Makefile: Fix a typo. 2001-03-14 David Mosberger <davidm@hpl.hp.com> * gmon/gmon.c (write_call_graph): Avoid unaligned accesses when writing arc structures. 2001-03-15 H.J. Lu <hjl@gnu.org> * elf/Makefile ($(objpfx)tst-pathopt.out): Protected against cross-compiling. 2001-03-13 Andreas Schwab <schwab@suse.de> * posix/PTESTS2C.sed: Replace literal CRs by `\r'. 2001-03-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Fix test for control message fitting into message data. Patch by James Antill <james@and.org>.
Diffstat (limited to 'sysdeps/unix/sysv/linux/cmsg_nxthdr.c')
-rw-r--r--sysdeps/unix/sysv/linux/cmsg_nxthdr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
index fda37f37aa..e6664d1e00 100644
--- a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
+++ b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
@@ -1,5 +1,5 @@
/* Return point to next ancillary data entry in message header.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2001 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
@@ -32,7 +32,7 @@ __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
if ((unsigned char *) (cmsg + 1) >= ((unsigned char *) mhdr->msg_control
+ mhdr->msg_controllen)
|| ((unsigned char *) cmsg + CMSG_ALIGN (cmsg->cmsg_len)
- >= ((unsigned char *) mhdr->msg_control + mhdr->msg_controllen)))
+ > ((unsigned char *) mhdr->msg_control + mhdr->msg_controllen)))
/* No more entries. */
return NULL;
return cmsg;