mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

4373. [bug] Address undefined behaviour in getaddrinfo. [RT #42479]

Browse Source
This commit is contained in:
Mark Andrews
2016-05-26 12:05:37 +10:00
parent 10f8dc8456
commit ede52ba98d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
4373. [bug] Address undefined behaviour in getaddrinfo. [RT #42479]
4372. [bug] Address undefined behaviour in libt_api. [RT #42480] 4372. [bug] Address undefined behaviour in libt_api. [RT #42480]
4371. [func] New "minimal-any" option reduces the size of UDP 4371. [func] New "minimal-any" option reduces the size of UDP

6
lib/irs/getaddrinfo.c
View File

@@ -417,7 +417,7 @@ getaddrinfo(const char *hostname, const char *servname,
goto inet6_addr; goto inet6_addr;
} }
addrsize = sizeof(struct in_addr); addrsize = sizeof(struct in_addr);
addroff = (char *)(&SIN(0)->sin_addr) - (char *)0; addroff = offsetof(struct sockaddr_in, sin_addr);
family = AF_INET; family = AF_INET;
goto common; goto common;
#ifdef IRS_HAVE_SIN6_SCOPE_ID #ifdef IRS_HAVE_SIN6_SCOPE_ID
@@ -426,7 +426,7 @@ getaddrinfo(const char *hostname, const char *servname,
if (family && family != AF_INET6) if (family && family != AF_INET6)
return (EAI_NONAME); return (EAI_NONAME);
addrsize = sizeof(struct in6_addr); addrsize = sizeof(struct in6_addr);
addroff = (char *)(&SIN6(0)->sin6_addr) - (char *)0; addroff = offsetof(struct sockaddr_in6, sin6_addr);
family = AF_INET6; family = AF_INET6;
goto common; goto common;
#endif #endif
@@ -435,7 +435,7 @@ getaddrinfo(const char *hostname, const char *servname,
return (EAI_NONAME); return (EAI_NONAME);
inet6_addr: inet6_addr:
addrsize = sizeof(struct in6_addr); addrsize = sizeof(struct in6_addr);
addroff = (char *)(&SIN6(0)->sin6_addr) - (char *)0; addroff = offsetof(struct sockaddr_in6, sin6_addr);
family = AF_INET6; family = AF_INET6;
common: common: