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

some platform. [RT #13744]
This commit is contained in:
Mark Andrews
2005-03-30 05:37:08 +00:00
parent 574367734b
commit 2132a56b5c
2 changed files with 9 additions and 2 deletions

View File

@@ -1,3 +1,6 @@
1841. [port] cmsg_len() could produce incorrect results on
some platform. [RT #13744]
1841. [placeholder] rt13694
1840. [func] dnssec-signzone can now randomize signature end times

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.247 2005/03/16 23:39:06 marka Exp $ */
/* $Id: socket.c,v 1.248 2005/03/30 05:37:08 marka Exp $ */
#include <config.h>
@@ -465,7 +465,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
}