From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 11 Dec 2008 23:27:22 +0000 (+0000)
Subject: Dan F pointed out that we don't need to scan IPv6 addresses for '%'-letters
X-Git-Tag: curl-7_19_3~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0dfe6e51d2bdaa0cf6dedfdad8bd7748f9edd36;p=thirdparty%2Fcurl.git

Dan F pointed out that we don't need to scan IPv6 addresses for '%'-letters
in the parse_remote_port() function as the scope id has already been stripped
from the string.
---

diff --git a/lib/url.c b/lib/url.c
index 3e2b14e9d0..0f25a9d3ee 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3724,7 +3724,10 @@ static CURLcode parse_remote_port(struct SessionHandle *data,
   char *portptr;
   char endbracket;
 
-  if((1 == sscanf(conn->host.name, "[%*45[0123456789abcdefABCDEF:.%]%c",
+  /* Note that at this point, the IPv6 address cannot contain any scope
+     suffix as that has already been removed in the ParseURLAndFillConnection()
+     function */
+  if((1 == sscanf(conn->host.name, "[%*45[0123456789abcdefABCDEF:.]%c",
                   &endbracket)) &&
      (']' == endbracket)) {
     /* this is a RFC2732-style specified IP-address */