walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Fix dead code found by coverity scan

This commit is contained in:
Tatsuhiro Tsujikawa 2016-12-18 22:14:26 +09:00
parent 46acf32c41
commit 02d34c8c4c
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shrpx_dns_resolver.cc
View File

@ -293,9 +293,11 @@ void DNSResolver::on_result(int status, hostent *hostent) {
return; return;
} }
auto ap = *hostent->h_addr_list;
assert(ap);
switch (hostent->h_addrtype) { switch (hostent->h_addrtype) {
case AF_INET: case AF_INET:
for (auto ap = hostent->h_addr_list; *ap; ++ap) {
status_ = DNS_STATUS_OK; status_ = DNS_STATUS_OK;
result_.len = sizeof(result_.su.in); result_.len = sizeof(result_.su.in);
result_.su.in = {}; result_.su.in = {};
@ -303,12 +305,9 @@ void DNSResolver::on_result(int status, hostent *hostent) {
#ifdef HAVE_SOCKADDR_IN_SIN_LEN #ifdef HAVE_SOCKADDR_IN_SIN_LEN
result_.su.in.sin_len = sizeof(result_.su.in); result_.su.in.sin_len = sizeof(result_.su.in);
#endif // HAVE_SOCKADDR_IN_SIN_LEN #endif // HAVE_SOCKADDR_IN_SIN_LEN
memcpy(&result_.su.in.sin_addr, *ap, sizeof(result_.su.in.sin_addr)); memcpy(&result_.su.in.sin_addr, ap, sizeof(result_.su.in.sin_addr));
break;
}
break; break;
case AF_INET6: case AF_INET6:
for (auto ap = hostent->h_addr_list; *ap; ++ap) {
status_ = DNS_STATUS_OK; status_ = DNS_STATUS_OK;
result_.len = sizeof(result_.su.in6); result_.len = sizeof(result_.su.in6);
result_.su.in6 = {}; result_.su.in6 = {};
@ -316,9 +315,7 @@ void DNSResolver::on_result(int status, hostent *hostent) {
#ifdef HAVE_SOCKADDR_IN6_SIN6_LEN #ifdef HAVE_SOCKADDR_IN6_SIN6_LEN
result_.su.in6.sin6_len = sizeof(result_.su.in6); result_.su.in6.sin6_len = sizeof(result_.su.in6);
#endif // HAVE_SOCKADDR_IN6_SIN6_LEN #endif // HAVE_SOCKADDR_IN6_SIN6_LEN
memcpy(&result_.su.in6.sin6_addr, *ap, sizeof(result_.su.in6.sin6_addr)); memcpy(&result_.su.in6.sin6_addr, ap, sizeof(result_.su.in6.sin6_addr));
break;
}
break; break;
default: default:
assert(0); assert(0);