marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Check return value from MSIREG_OpenInstallProps (Coverity).

oldstable
André Hentschel 2014-01-04 19:17:01 +01:00 committed by Alexandre Julliard
parent 57d2e8f3c3
commit 2d6685f4ec
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msi/msi.c
View File

@ -1138,8 +1138,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
context = MSIINSTALLCONTEXT_MACHINE;
}
MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE);
if (!strcmpW( szAttribute, INSTALLPROPERTY_HELPLINKW ) ||
!strcmpW( szAttribute, INSTALLPROPERTY_HELPTELEPHONEW ) ||
!strcmpW( szAttribute, INSTALLPROPERTY_INSTALLDATEW ) ||
@ -1162,9 +1160,11 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
r = ERROR_UNKNOWN_PRODUCT;
goto done;
}
if (!userdata)
return ERROR_UNKNOWN_PROPERTY;
if (MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE))
{
r = ERROR_UNKNOWN_PROPERTY;
goto done;
}
if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEW ))
szAttribute = display_name;
@ -1174,6 +1174,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
val = msi_reg_get_value(userdata, szAttribute, &type);
if (!val)
val = empty;
RegCloseKey(userdata);
}
else if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTANCETYPEW ) ||
!strcmpW( szAttribute, INSTALLPROPERTY_TRANSFORMSW ) ||
@ -1266,7 +1267,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
done:
RegCloseKey(prodkey);
RegCloseKey(userdata);
return r;
}