msi: Avoid leaking memory on failure paths in MsiGetPropertyA().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Avoid leaking memory on failure paths in MsiGetPropertyA().
2e2934e4 · Zebediah Figura · Alexandre Julliard · b86825ac · 2e2934e4
Commit 2e2934e4 authored May 17, 2018 by Zebediah Figura Committed by Alexandre Julliard May 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

package.c dlls/msi/package.c +5 -1

No files found.
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -2368,9 +2368,14 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD 
        DWORD len;

        if (!(remote = msi_get_remote(hinst)))
+        {
+            heap_free(nameW);
            return ERROR_INVALID_HANDLE;
+        }

        r = remote_GetProperty(remote, nameW, &value, &len);
+        heap_free(nameW);
+
        if (!r)
        {
            /* String might contain embedded nulls.
@@ -2388,7 +2393,6 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD 
            heap_free(tmp);
        }
        midl_user_free(value);
-        heap_free(nameW);
        return r;
    }