crypt32: Don't get confused matching URLs with a colon in the userinfo portion…

crypt32: Don't get confused matching URLs with a colon in the userinfo portion (e.g. user:password@domain).

crypt32: Don't get confused matching URLs with a colon in the userinfo portion…
4e18ac60 · Juan Lang · Alexandre Julliard · 79a20453 · 4e18ac60
Commit 4e18ac60 authored Dec 18, 2009 by Juan Lang Committed by Alexandre Julliard Dec 21, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

chain.c dlls/crypt32/chain.c +6 -2

No files found.
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -686,8 +686,12 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name,
            authority_end = strchrW(name, '?');
        if (!authority_end)
            authority_end = name + strlenW(name);
-        /* Remove any port number from the authority */
-        for (colon = authority_end; colon >= name && *colon != ':'; colon--)
+        /* Remove any port number from the authority.  The userinfo portion
+         * of an authority may contain a colon, so stop if a userinfo portion
+         * is found (indicated by '@').
+         */
+        for (colon = authority_end; colon >= name && *colon != ':' &&
+         *colon != '@'; colon--)
            ;
        if (*colon == ':')
            authority_end = colon;