kernelbase: Also return E_FAIL when trying to parse username, password, or port…

kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Also return E_FAIL when trying to parse username, password, or port…
ef64aea7 · Zebediah Figura · Alexandre Julliard · 824fcbae · ef64aea7 · ef64aea7
Commit ef64aea7 authored Feb 14, 2022 by Zebediah Figura Committed by Alexandre Julliard Feb 15, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 19 deletions

path.c dlls/kernelbase/path.c +18 -16

url.c dlls/shlwapi/tests/url.c +3 -3

No files found.
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p

    hr = parse_url(url, &pl);

+    switch (scheme)
+    {
+        case URL_SCHEME_FILE:
+        case URL_SCHEME_FTP:
+        case URL_SCHEME_GOPHER:
+        case URL_SCHEME_HTTP:
+        case URL_SCHEME_HTTPS:
+        case URL_SCHEME_TELNET:
+        case URL_SCHEME_NEWS:
+        case URL_SCHEME_NNTP:
+        case URL_SCHEME_SNEWS:
+            break;
+
+        default:
+            if (part != URL_PART_SCHEME && part != URL_PART_QUERY)
+                return E_FAIL;
+    }
+
    switch (part)
    {
    case URL_PART_SCHEME:
@@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p
        break;

    case URL_PART_HOSTNAME:
-        switch (scheme)
-        {
-            case URL_SCHEME_FILE:
-            case URL_SCHEME_FTP:
-            case URL_SCHEME_GOPHER:
-            case URL_SCHEME_HTTP:
-            case URL_SCHEME_HTTPS:
-            case URL_SCHEME_TELNET:
-            case URL_SCHEME_NEWS:
-            case URL_SCHEME_NNTP:
-            case URL_SCHEME_SNEWS:
-                break;
-            default:
-                return E_FAIL;
-        }
-
        if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':')))
        {
            *out = '\0';

--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -601,10 +601,10 @@ static void test_UrlGetPart(void)
    tests[] =
    {
        {"hi", URL_PART_SCHEME, 0, S_FALSE, ""},
-        {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE},
-        {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE},
+        {"hi", URL_PART_USERNAME, 0, E_FAIL},
+        {"hi", URL_PART_PASSWORD, 0, E_FAIL},
        {"hi", URL_PART_HOSTNAME, 0, E_FAIL},
-        {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE},
+        {"hi", URL_PART_PORT, 0, E_FAIL},
        {"hi", URL_PART_QUERY, 0, S_FALSE, ""},

        {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"},