reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-07 20:57:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: Do not crash in MsiGetUserInfo if org, user or serial are not present, instead return USERINFOSTATE_ABSENT.

Browse Source
This commit is contained in:
Aric Stewart 2007-04-12 14:46:43 +09:00 committed by Alexandre Julliard
parent c569ab2a67
commit b46ab0b8cb
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/msi/msi.c
View File

@ -1562,15 +1562,29 @@ static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct,
state = USERINFOSTATE_PRESENT;
r = msi_strcpy_to_awstring( user, lpUserNameBuf, pcchUserNameBuf );
if (r == ERROR_MORE_DATA)
state = USERINFOSTATE_MOREDATA;
r = msi_strcpy_to_awstring( org, lpOrgNameBuf, pcchOrgNameBuf );
if (r == ERROR_MORE_DATA)
state = USERINFOSTATE_MOREDATA;
r = msi_strcpy_to_awstring( serial, lpSerialBuf, pcchSerialBuf );
if (r == ERROR_MORE_DATA)
state = USERINFOSTATE_MOREDATA;
if (user)
{
r = msi_strcpy_to_awstring( user, lpUserNameBuf, pcchUserNameBuf );
if (r == ERROR_MORE_DATA)
state = USERINFOSTATE_MOREDATA;
}
else
state = USERINFOSTATE_ABSENT;
if (org)
{
r = msi_strcpy_to_awstring( org, lpOrgNameBuf, pcchOrgNameBuf );
if (r == ERROR_MORE_DATA && state == USERINFOSTATE_PRESENT)
state = USERINFOSTATE_MOREDATA;
}
/* msdn states: The user information is considered to be present even in the absence of a company name. */
if (serial)
{
r = msi_strcpy_to_awstring( serial, lpSerialBuf, pcchSerialBuf );
if (r == ERROR_MORE_DATA && state == USERINFOSTATE_PRESENT)
state = USERINFOSTATE_MOREDATA;
}
else
state = USERINFOSTATE_ABSENT;
msi_free( user );
msi_free( org );