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:
parent
df085a31ff
commit
5703c14110
|
@ -6790,25 +6790,34 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param )
|
||||||
if (res != ERROR_SUCCESS || !value)
|
if (res != ERROR_SUCCESS || !value)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
if (value && !deformat_string(package, value, &deformatted))
|
if (value)
|
||||||
{
|
{
|
||||||
res = ERROR_OUTOFMEMORY;
|
DWORD len = deformat_string( package, value, &deformatted );
|
||||||
goto done;
|
if (!deformatted)
|
||||||
}
|
{
|
||||||
|
res = ERROR_OUTOFMEMORY;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
if ((value = deformatted))
|
if (len)
|
||||||
{
|
|
||||||
if (flags & ENV_MOD_PREFIX)
|
|
||||||
{
|
{
|
||||||
p = wcsrchr( value, ';' );
|
value = deformatted;
|
||||||
len_value = p - value;
|
if (flags & ENV_MOD_PREFIX)
|
||||||
|
{
|
||||||
|
p = wcsrchr( value, ';' );
|
||||||
|
len_value = p - value;
|
||||||
|
}
|
||||||
|
else if (flags & ENV_MOD_APPEND)
|
||||||
|
{
|
||||||
|
value = wcschr( value, ';' ) + 1;
|
||||||
|
len_value = lstrlenW( value );
|
||||||
|
}
|
||||||
|
else len_value = lstrlenW( value );
|
||||||
}
|
}
|
||||||
else if (flags & ENV_MOD_APPEND)
|
else
|
||||||
{
|
{
|
||||||
value = wcschr( value, ';' ) + 1;
|
value = NULL;
|
||||||
len_value = lstrlenW( value );
|
|
||||||
}
|
}
|
||||||
else len_value = lstrlenW( value );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
res = open_env_key( flags, &env );
|
res = open_env_key( flags, &env );
|
||||||
|
@ -6997,22 +7006,34 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param )
|
||||||
return ERROR_SUCCESS;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value && !deformat_string( package, value, &deformatted ))
|
if (value)
|
||||||
return ERROR_OUTOFMEMORY;
|
|
||||||
|
|
||||||
if ((value = deformatted))
|
|
||||||
{
|
{
|
||||||
if (flags & ENV_MOD_PREFIX)
|
DWORD len = deformat_string( package, value, &deformatted );
|
||||||
|
if (!deformatted)
|
||||||
{
|
{
|
||||||
p = wcschr( value, ';' );
|
res = ERROR_OUTOFMEMORY;
|
||||||
len_value = p - value;
|
goto done;
|
||||||
}
|
}
|
||||||
else if (flags & ENV_MOD_APPEND)
|
|
||||||
|
if (len)
|
||||||
{
|
{
|
||||||
value = wcschr( value, ';' ) + 1;
|
value = deformatted;
|
||||||
len_value = lstrlenW( value );
|
if (flags & ENV_MOD_PREFIX)
|
||||||
|
{
|
||||||
|
p = wcsrchr( value, ';' );
|
||||||
|
len_value = p - value;
|
||||||
|
}
|
||||||
|
else if (flags & ENV_MOD_APPEND)
|
||||||
|
{
|
||||||
|
value = wcschr( value, ';' ) + 1;
|
||||||
|
len_value = lstrlenW( value );
|
||||||
|
}
|
||||||
|
else len_value = lstrlenW( value );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
value = NULL;
|
||||||
}
|
}
|
||||||
else len_value = lstrlenW( value );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
r = open_env_key( flags, &env );
|
r = open_env_key( flags, &env );
|
||||||
|
|
|
@ -249,7 +249,9 @@ static const char env_environment_dat[] =
|
||||||
"Var27\t+-MSITESTVAR21\t[~];1\tOne\n"
|
"Var27\t+-MSITESTVAR21\t[~];1\tOne\n"
|
||||||
"Var28\t-MSITESTVAR22\t1\tOne\n"
|
"Var28\t-MSITESTVAR22\t1\tOne\n"
|
||||||
"Var29\t-MSITESTVAR23\t2\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[] =
|
static const char service_install_dat[] =
|
||||||
"ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"
|
"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, "MSITESTVAR19", "1");
|
||||||
CHECK_REG_STR(env, "MSITESTVAR20", "1");
|
CHECK_REG_STR(env, "MSITESTVAR20", "1");
|
||||||
CHECK_REG_STR(env, "MSITESTVAR21", "1");
|
CHECK_REG_STR(env, "MSITESTVAR21", "1");
|
||||||
|
CHECK_REG_STR(env, "MSITESTVAR24", "TestService");
|
||||||
CHECK_REG_STR(env2, "MSITESTVAR100", "1");
|
CHECK_REG_STR(env2, "MSITESTVAR100", "1");
|
||||||
|
|
||||||
res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2);
|
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);
|
res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2);
|
||||||
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
|
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");
|
r = MsiInstallProductA(msifile, "REMOVE=ALL");
|
||||||
ok(!r, "got %u\n", r);
|
ok(!r, "got %u\n", r);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue