msi: Handle NULL component correctly in MsiEnumComponentCostsW.

2afd65f6 · Hans Leidekker · Alexandre Julliard · 3ef0a28f · 2afd65f6
Commit 2afd65f6 authored May 06, 2011 by Hans Leidekker Committed by Alexandre Julliard May 06, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

msi.c dlls/msi/msi.c +2 -3

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1844,13 +1844,12 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i
    {
        HRESULT hr;
        IWineMsiRemotePackage *remote_package;
-        BSTR bname;
+        BSTR bname = NULL;

        if (!(remote_package = (IWineMsiRemotePackage *)msi_get_remote( handle )))
            return ERROR_INVALID_HANDLE;

-        bname = SysAllocString( component );
-        if (!bname)
+        if (component && !(bname = SysAllocString( component )))
        {
            IWineMsiRemotePackage_Release( remote_package );
            return ERROR_OUTOFMEMORY;