[PATCH 0/1] MR1957: wininet: Allocate returned options strings with the process heap.

[Rémi Bernon]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1957

[PATCH 1/1] wininet: Allocate returned options strings with the process heap.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/wininet/internet.c       | 43 ++++++++++++++++++++++++++++++-----
 dlls/wininet/tests/internet.c |  3 +++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 26d262b9665..2926fbccf9b 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -2522,6 +2522,37 @@ static WCHAR *get_proxy_autoconfig_url(void)
     return ret;
 }
 
+static WCHAR *copy_optionW(WCHAR *value)
+{
+    DWORD len;
+    void *tmp;
+
+    if (!value)
+        return NULL;
+
+    len = (wcslen(value) + 1) * sizeof(WCHAR);
+    if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len)))
+        return NULL;
+
+    return memcpy(tmp, value, len);
+}
+
+static char *copy_optionA(WCHAR *value)
+{
+    DWORD len;
+    void *tmp;
+
+    if (!value)
+        return NULL;
+
+    len = wcslen(value) * 3 + 1;
+    if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len)))
+        return NULL;
+
+    WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL);
+    return tmp;
+}
+
 static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode)
 {
     /* FIXME: This function currently handles more options than it should. Options requiring
@@ -2642,25 +2673,25 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u
 
             case INTERNET_PER_CONN_PROXY_SERVER:
                 if (unicode)
-                    optionW->Value.pszValue = wcsdup(pi.proxy);
+                    optionW->Value.pszValue = copy_optionW(pi.proxy);
                 else
-                    optionA->Value.pszValue = strdupWtoA(pi.proxy);
+                    optionA->Value.pszValue = copy_optionA(pi.proxy);
                 break;
 
             case INTERNET_PER_CONN_PROXY_BYPASS:
                 if (unicode)
-                    optionW->Value.pszValue = wcsdup(pi.proxyBypass);
+                    optionW->Value.pszValue = copy_optionW(pi.proxyBypass);
                 else
-                    optionA->Value.pszValue = strdupWtoA(pi.proxyBypass);
+                    optionA->Value.pszValue = copy_optionA(pi.proxyBypass);
                 break;
 
             case INTERNET_PER_CONN_AUTOCONFIG_URL:
                 if (!url)
                     optionW->Value.pszValue = NULL;
                 else if (unicode)
-                    optionW->Value.pszValue = wcsdup(url);
+                    optionW->Value.pszValue = copy_optionW(url);
                 else
-                    optionA->Value.pszValue = strdupWtoA(url);
+                    optionA->Value.pszValue = copy_optionA(url);
                 break;
 
             case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS:
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 0d58a12558e..04b7f1041f7 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1307,6 +1307,9 @@ static void test_Option_PerConnectionOption(void)
             list.pOptions[1].Value.dwValue);
     verifyProxyEnable(1);
 
+    ret = HeapValidate(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue);
+    ok(ret, "HeapValidate failed, last error %lu\n", GetLastError());
+
     HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue);
     HeapFree(GetProcessHeap(), 0, list.pOptions);
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1957

[PATCH 0/1] MR1957: wininet: Allocate returned options strings with the process heap. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1957