Merge pull request #1272 from sipa/ipv6fixes

A few IPv6 fixes

1 files changed, 8 insertions, 6 deletions

diff --git a/src/netbase.cpp b/src/netbase.cpp
index ebf823e899..f09d981c49 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -464,12 +464,14 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
     int port = portDefault;
 
     size_t colon = strDest.find_last_of(':');
-    char *endp = NULL;
-    int n = strtol(pszDest + colon + 1, &endp, 10);
-    if (endp && *endp == 0 && n >= 0) {
-        strDest = strDest.substr(0, colon);
-        if (n > 0 && n < 0x10000)
-            port = n;
+    if (colon != strDest.npos) {
+        char *endp = NULL;
+        int n = strtol(pszDest + colon + 1, &endp, 10);
+        if (endp && *endp == 0 && n >= 0) {
+            strDest = strDest.substr(0, colon);
+            if (n > 0 && n < 0x10000)
+                port = n;
+        }
     }
     if (strDest[0] == '[' && strDest[strDest.size()-1] == ']')
         strDest = strDest.substr(1, strDest.size()-2);