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

msi: Fix parsing of an empty property followed by a non-empty property.

This commit is contained in:
Hans Leidekker 2011-04-05 12:03:36 +02:00 committed by Alexandre Julliard
parent ecf217bbe4
commit ce0b3a030b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msi/action.c
View File

@ -231,6 +231,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
if (!count) goto done;
in_quotes = 1;
ignore = 1;
len++;
break;
case '"':
state = state_quote;
@ -258,6 +259,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
state = state_whitespace;
if (!count) goto done;
in_quotes = 1;
len++;
break;
default:
if (!count) in_quotes = 0;
@ -276,8 +278,9 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
break;
case ' ':
state = state_whitespace;
if (!count) goto done;
if (!count || (count > 1 && !len)) goto done;
in_quotes = 1;
len++;
break;
default:
state = state_token;

4
dlls/msi/tests/install.c
View File

@ -6346,6 +6346,10 @@ static void test_command_line_parsing(void)
r = MsiInstallProductA(msifile, cmd);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
cmd = "Q=\"\" P=\"one\"";
r = MsiInstallProductA(msifile, cmd);
ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
DeleteFile(msifile);
RemoveDirectory("msitest");
}