[v2 PATCH] mfplat: Correctly caclulate url scheme length.

Nikolay Sivov nsivov at codeweavers.com
Wed Feb 23 03:23:34 CST 2022


From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>

When a url is passed in, for example "http://..."
We need to include the : in the scheme string not exclude it.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

v2: minor change to exclude null terminator from file scheme constant length.

 dlls/mfplat/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 7991152f7a7..cee052defeb 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -6469,10 +6469,11 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch
     if (ptr == url || *ptr != ':')
     {
         url = fileschemeW;
-        ptr = fileschemeW + ARRAY_SIZE(fileschemeW) - 1;
+        len = ARRAY_SIZE(fileschemeW) - 1;
     }
+    else
+        len = ptr - url + 1;
 
-    len = ptr - url;
     scheme = malloc((len + 1) * sizeof(WCHAR));
     if (!scheme)
         return E_OUTOFMEMORY;
-- 
2.34.1




More information about the wine-devel mailing list