daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns_conf: fix memory corruption issue when ip number greater than 8.

Browse Source
This commit is contained in:
Nick Peng
2023-07-28 22:42:36 +08:00
parent 8d3a62c568
commit b133ce408a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dns_conf.c
View File

@@ -1656,16 +1656,18 @@ static int _conf_domain_rule_address(char *domain, const char *domain_address)
case AF_INET: { case AF_INET: {
struct sockaddr_in *addr_in = NULL; struct sockaddr_in *addr_in = NULL;
addr_in = (struct sockaddr_in *)&addr; addr_in = (struct sockaddr_in *)&addr;
memcpy(ipv4_addr[ipv4_num], &addr_in->sin_addr.s_addr, DNS_RR_A_LEN); if (ipv4_num < DNS_MAX_REPLY_IP_NUM) {
ipv4_num++; memcpy(ipv4_addr[ipv4_num], &addr_in->sin_addr.s_addr, DNS_RR_A_LEN);
ipv4_num++;
}
} break; } break;
case AF_INET6: { case AF_INET6: {
struct sockaddr_in6 *addr_in6 = NULL; struct sockaddr_in6 *addr_in6 = NULL;
addr_in6 = (struct sockaddr_in6 *)&addr; addr_in6 = (struct sockaddr_in6 *)&addr;
if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr)) { if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr) && ipv4_num < DNS_MAX_REPLY_IP_NUM) {
memcpy(ipv4_addr[ipv4_num], addr_in6->sin6_addr.s6_addr + 12, DNS_RR_A_LEN); memcpy(ipv4_addr[ipv4_num], addr_in6->sin6_addr.s6_addr + 12, DNS_RR_A_LEN);
ipv4_num++; ipv4_num++;
} else { } else if (ipv6_num < DNS_MAX_REPLY_IP_NUM) {
memcpy(ipv6_addr[ipv6_num], addr_in6->sin6_addr.s6_addr, DNS_RR_AAAA_LEN); memcpy(ipv6_addr[ipv6_num], addr_in6->sin6_addr.s6_addr, DNS_RR_AAAA_LEN);
ipv6_num++; ipv6_num++;
} }