wininet: Use heap_strndupAtoW in InternetOpenUrlA.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wininet: Use heap_strndupAtoW in InternetOpenUrlA.
82d413d9 · Jacek Caban · Alexandre Julliard · d282a642 · 82d413d9
Commit 82d413d9 authored Apr 27, 2016 by Jacek Caban Committed by Alexandre Julliard Apr 27, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

internet.c dlls/wininet/internet.c +5 -9

No files found.
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3706,9 +3706,8 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl,
    LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext)
 {
    HINTERNET rc = NULL;
-    DWORD lenHeaders = 0;
    LPWSTR szUrl = NULL;
-    LPWSTR szHeaders = NULL;
+    WCHAR *headers = NULL;
    TRACE("\n");
@@ -3719,20 +3718,17 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl,
    }
    if(lpszHeaders) {
-        lenHeaders = MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, NULL, 0 );
+        headers = heap_strndupAtoW(lpszHeaders, dwHeadersLength, &dwHeadersLength);
-        szHeaders = heap_alloc(lenHeaders*sizeof(WCHAR));
+        if(!headers) {
-        if(!szHeaders) {
            heap_free(szUrl);
            return NULL;
        }
-        MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, szHeaders, lenHeaders);
    }
-    rc = InternetOpenUrlW(hInternet, szUrl, szHeaders,
+    rc = InternetOpenUrlW(hInternet, szUrl, headers, dwHeadersLength, dwFlags, dwContext);
-        lenHeaders, dwFlags, dwContext);
    heap_free(szUrl);
-    heap_free(szHeaders);
+    heap_free(headers);
    return rc;
 }