From 3ada4e23acae40b0434e6118752a44519668f618 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Sun, 15 Jan 2017 21:45:27 +0100 Subject: [PATCH] Fix negative port detection for IPv6 addresses on 32-bit On a 32-bit Arch, our `test_ComboAddress` unit test fails because `ComboAddress("[::1]:-6")` is considered valid. This is caused by `stoul()` not throwing for a negative value and returning an `unsigned long` value using unsigned integer wraparound rules. Since we used to store the result value in a `signed int` and treat negative values as if the port was not set, the test failed. --- pdns/misc.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pdns/misc.cc b/pdns/misc.cc index ddfbc7b64..8e764f7b2 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -733,7 +733,8 @@ int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret) if(addr.empty()) return -1; string ourAddr(addr); - int port = -1; + bool portSet = false; + unsigned int port; if(addr[0]=='[') { // [::]:53 style address string::size_type pos = addr.find(']'); if(pos == string::npos || pos + 2 > addr.size() || addr[pos+1]!=':') @@ -741,6 +742,7 @@ int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret) ourAddr.assign(addr.c_str() + 1, pos-1); try { port = pdns_stou(addr.substr(pos+2)); + portSet = true; } catch(std::out_of_range) { return -1; @@ -766,12 +768,12 @@ int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret) freeaddrinfo(res); } - if(port > 65535) - // negative ports are found with the pdns_stou above - return -1; + if(portSet) { + if(port > 65535) + return -1; - if(port >= 0) ret->sin6_port = htons(port); + } return 0; } -- 2.40.0