1842. [port] cmsg_len() could produce incorrect results on

some platform. [RT #13744]
This commit is contained in:
Mark Andrews
2005-03-30 05:48:32 +00:00
parent 0ebceb2589
commit 711d658fd8
2 changed files with 9 additions and 2 deletions

View File

@@ -1,3 +1,6 @@
1842. [port] cmsg_len() could produce incorrect results on
some platform. [RT #13744]
1839. [bug] <isc/hash.h> was not being installed.
1836. [cleanup] Silence compiler warnings in hash_test.c.

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.207.2.19.2.17 2005/03/17 03:58:33 marka Exp $ */
/* $Id: socket.c,v 1.207.2.19.2.18 2005/03/30 05:48:32 marka Exp $ */
#include <config.h>
@@ -461,7 +461,11 @@ cmsg_len(ISC_SOCKADDR_LEN_T len) {
#else
ISC_SOCKADDR_LEN_T hdrlen;
hdrlen = (ISC_SOCKADDR_LEN_T)CMSG_DATA(NULL); /* XXX */
/*
* Cast NULL so that any pointer arithmetic performed by CMSG_DATA
* is correct.
*/
hdrlen = (ISC_SOCKADDR_LEN_T)CMSG_DATA(((struct cmsghdr *)NULL));
return (hdrlen + len);
#endif
}