ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Check for a NULL return from deformat_string() when checking for failure. 

An empty string is valid, and can occur if e.g. a nonexistent property is
expanded.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51091
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>
(cherry picked from commit 814f18ab75)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Zebediah Figura 2021-05-02 21:42:47 -05:00 committed by Michael Stefaniuc
parent df085a31ff
commit 5703c14110
2 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/msi/action.c
View File

@ -6790,14 +6790,18 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param )
if (res != ERROR_SUCCESS || !value)
goto done;
if (value && !deformat_string(package, value, &deformatted))
if (value)
{
DWORD len = deformat_string( package, value, &deformatted );
if (!deformatted)
{
res = ERROR_OUTOFMEMORY;
goto done;
}
if ((value = deformatted))
if (len)
{
value = deformatted;
if (flags & ENV_MOD_PREFIX)
{
p = wcsrchr( value, ';' );
@ -6810,6 +6814,11 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param )
}
else len_value = lstrlenW( value );
}
else
{
value = NULL;
}
}
res = open_env_key( flags, &env );
if (res != ERROR_SUCCESS)
@ -6997,14 +7006,21 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param )
return ERROR_SUCCESS;
}
if (value && !deformat_string( package, value, &deformatted ))
return ERROR_OUTOFMEMORY;
if ((value = deformatted))
if (value)
{
DWORD len = deformat_string( package, value, &deformatted );
if (!deformatted)
{
res = ERROR_OUTOFMEMORY;
goto done;
}
if (len)
{
value = deformatted;
if (flags & ENV_MOD_PREFIX)
{
p = wcschr( value, ';' );
p = wcsrchr( value, ';' );
len_value = p - value;
}
else if (flags & ENV_MOD_APPEND)
@ -7014,6 +7030,11 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param )
}
else len_value = lstrlenW( value );
}
else
{
value = NULL;
}
}
r = open_env_key( flags, &env );
if (r != ERROR_SUCCESS)

8
dlls/msi/tests/action.c
View File

@ -249,7 +249,9 @@ static const char env_environment_dat[] =
"Var27\t+-MSITESTVAR21\t[~];1\tOne\n"
"Var28\t-MSITESTVAR22\t1\tOne\n"
"Var29\t-MSITESTVAR23\t2\tOne\n"
"Var30\t*MSITESTVAR100\t1\tOne\n";
"Var30\t*MSITESTVAR100\t1\tOne\n"
"Var31\t-=MSITESTVAR24\t[SERVNAME]\tOne\n"
"Var32\t-=MSITESTVAR25\t[bogus_prop]\tOne\n";
static const char service_install_dat[] =
"ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"
@ -5050,6 +5052,7 @@ static void test_envvar(void)
CHECK_REG_STR(env, "MSITESTVAR19", "1");
CHECK_REG_STR(env, "MSITESTVAR20", "1");
CHECK_REG_STR(env, "MSITESTVAR21", "1");
CHECK_REG_STR(env, "MSITESTVAR24", "TestService");
CHECK_REG_STR(env2, "MSITESTVAR100", "1");
res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2);
@ -5058,6 +5061,9 @@ static void test_envvar(void)
res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegDeleteValueA(env, "MSITESTVAR25");
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(!r, "got %u\n", r);