msi: Don't free str until the last instance of its use.

This commit is contained in:
James Hawkins 2009-12-13 19:35:33 -08:00 committed by Alexandre Julliard
parent f4829063bc
commit a7fe36b327
1 changed files with 2 additions and 3 deletions

View File

@ -2084,7 +2084,7 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags,
UINT ret; UINT ret;
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
LPWSTR str; LPWSTR str = NULL;
VARIANTARG varg0, varg1; VARIANTARG varg0, varg1;
if (!(wFlags & DISPATCH_PROPERTYGET)) if (!(wFlags & DISPATCH_PROPERTYGET))
@ -2118,8 +2118,6 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags,
} }
ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), str, &size); ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), str, &size);
msi_free(str);
if (ret != ERROR_SUCCESS) if (ret != ERROR_SUCCESS)
{ {
hr = DISP_E_EXCEPTION; hr = DISP_E_EXCEPTION;
@ -2130,6 +2128,7 @@ static HRESULT InstallerImpl_ProductInfo(WORD wFlags,
hr = S_OK; hr = S_OK;
done: done:
msi_free(str);
VariantClear(&varg0); VariantClear(&varg0);
VariantClear(&varg1); VariantClear(&varg1);
return hr; return hr;