wininet: The lpszLocalFileName parameter to CommitUrlCacheEntryA is optional, so…

wininet: The lpszLocalFileName parameter to CommitUrlCacheEntryA is optional, so check before converting it from Unicode to ANSI.

wininet: The lpszLocalFileName parameter to CommitUrlCacheEntryA is optional, so…
99f651bd · Rob Shearman · Alexandre Julliard · f15287de · 99f651bd
Commit 99f651bd authored Mar 17, 2008 by Rob Shearman Committed by Alexandre Julliard Mar 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

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

No files found.
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -2494,11 +2494,14 @@ BOOL WINAPI CommitUrlCacheEntryA(
        goto cleanup;
    MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, url_name, len);
-    len = MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, NULL, 0);
+    if (lpszLocalFileName)
-    local_file_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+    {
-    if (!local_file_name)
+        len = MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, NULL, 0);
-        goto cleanup;
+        local_file_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-    MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, local_file_name, len);
+        if (!local_file_name)
+            goto cleanup;
+        MultiByteToWideChar(CP_ACP, 0, lpszLocalFileName, -1, local_file_name, len);
+    }
    if (lpszFileExtension)
    {
        len = MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, NULL, 0);
@@ -2522,6 +2525,7 @@ BOOL WINAPI CommitUrlCacheEntryA(
 cleanup:
    HeapFree(GetProcessHeap(), 0, original_url);
+    HeapFree(GetProcessHeap(), 0, file_extension);
    HeapFree(GetProcessHeap(), 0, local_file_name);
    HeapFree(GetProcessHeap(), 0, url_name);