mshtml: Handle empty strings in heap_strndupWtoU.

The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Handle empty strings in heap_strndupWtoU.
239b5726 · Gabriel Ivăncescu · Alexandre Julliard · 7d7d1662 · 239b5726 · 239b5726
Commit 239b5726 authored May 26, 2022 by Gabriel Ivăncescu Committed by Alexandre Julliard May 27, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

mshtml_private.h dlls/mshtml/mshtml_private.h +3 -3

http.c dlls/wininet/tests/http.c +7 -0

No files found.
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len)
    char *ret = NULL;
    DWORD size;

-    if(str && len) {
-        size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL);
+    if(str) {
+        size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0;
        ret = heap_alloc(size + 1);
        if(ret) {
-            WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL);
+            if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL);
            ret[size] = '\0';
        }
    }

--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -4527,6 +4527,13 @@ static const http_status_test_t http_status_tests[] = {
        ""
    },
    {
+        "HTTP/1.1 200 \r\n"
+        "Content-Length: 1\r\n"
+        "\r\nx",
+        200,
+        ""
+    },
+    {
        "HTTP/1.1 410 \r\n"
        "Content-Length: 1\r\n"
        "\r\nx",