[PATCH v3 0/3] MR1550: misc: Fix some invalid frees of wine_get_dos_file_name.

[Rémi Bernon (＠rbernon)]

--
  v3: winepath: Free wine_get_(dos|unix)_file_name memory with HeapFree.
      mshtml: Free wine_get_dos_file_name memory with HeapFree.
      appwiz.cpl: Free wine_get_dos_file_name memory with HeapFree.

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

[PATCH v3 1/3] appwiz.cpl: Free wine_get_dos_file_name memory with HeapFree.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/appwiz.cpl/addons.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index f7e36b8b99b..c63106de95b 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -233,7 +233,7 @@ static enum install_res install_from_unix_file(const char *dir, const WCHAR *sub
     if (p_wine_get_dos_file_name && (dos_dir = p_wine_get_dos_file_name( dir )))
     {
         ret = install_from_dos_file( dos_dir, subdir, file_name );
-        free( dos_dir );
+        HeapFree( GetProcessHeap(), 0, dos_dir );
     }
     return ret;
 }
@@ -329,7 +329,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists)
     }
     else if ((home_dir = _wgetenv( L"WINEHOMEDIR" )))
     {
-        if (!(cache_dir = malloc( wcslen(home_dir) * sizeof(WCHAR) + sizeof(L"\.cache") ))) return NULL;
+        if (!(cache_dir = HeapAlloc( GetProcessHeap(), 0, wcslen(home_dir) * sizeof(WCHAR) + sizeof(L"\.cache") ))) return NULL;
         lstrcpyW( cache_dir, home_dir );
         lstrcatW( cache_dir, L"\.cache" );
         cache_dir[1] = '\';  /* change ??\ into \?\ */
@@ -339,19 +339,19 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists)
     if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS)
     {
         WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(cache_dir), GetLastError() );
-        free( cache_dir );
+        HeapFree( GetProcessHeap(), 0, cache_dir );
         return NULL;
     }

size = lstrlenW( cache_dir ) + ARRAY_SIZE(L"\wine") + lstrlenW( addon->file_name ) + 1;
     if (!(ret = malloc( size * sizeof(WCHAR) )))
     {
-        free( cache_dir );
+        HeapFree( GetProcessHeap(), 0, cache_dir );
         return NULL;
     }
     lstrcpyW( ret, cache_dir );
     lstrcatW( ret, L"\wine" );
-    free( cache_dir );
+    HeapFree( GetProcessHeap(), 0, cache_dir );

if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS)
     {

[PATCH v3 2/3] mshtml: Free wine_get_dos_file_name memory with HeapFree.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mshtml/nsembed.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 66dd3f1d65e..8fb3b2a52ed 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -763,7 +763,7 @@ static WCHAR *find_wine_gecko_unix(const char *unix_path)

ret = check_version(dos_dir);

-    free(dos_dir);
+    HeapFree(GetProcessHeap(), 0, dos_dir);
     return ret;
 }

[PATCH v3 3/3] winepath: Free wine_get_(dos|unix)_file_name memory with HeapFree.

[Rémi Bernon]

From: Rémi Bernon

---
 programs/winepath/winepath.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c
index 88c64b91a42..9a322f40937 100644
--- a/programs/winepath/winepath.c
+++ b/programs/winepath/winepath.c
@@ -215,7 +215,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
                     {
                         printf("%s%c", unix_name, separator);
                     }
-                    free( unix_name );
+                    HeapFree( GetProcessHeap(), 0, unix_name );
                     break;
                 }

@@ -262,7 +262,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
             {
                 WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL);
                 printf("%s%c", path, separator);
-                free( windows_name );
+                HeapFree( GetProcessHeap(), 0, windows_name );
             }
             else printf("%c", separator);
             free( unix_name );

[PATCH v3 0/3] MR1550: misc: Fix some invalid frees of wine_get_dos_file_name. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.