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

reg: Stop parsing REG_SZ values containing NUL character sequences. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2021-03-12 22:32:24 +11:00 committed by Alexandre Julliard
parent b8b7979f9c
commit 272d35afc6
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/reg/import.c
View File

@ -324,8 +324,7 @@ static BOOL unescape_string(WCHAR *str, WCHAR **unparsed)
str[val_idx] = '\r';
break;
case '0':
str[val_idx] = '\0';
break;
return FALSE;
case '\\':
case '"':
str[val_idx] = str[str_idx];

24
programs/reg/tests/import.c
View File

@ -1600,12 +1600,12 @@ static void test_import(void)
"\"Wine70e\"=\"Value3\\0Value4\"\n"
"\"Wine70f\"=\"\\0Value5\"\n\n", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
todo_wine verify_reg_nonexist(hkey, "Wine70a");
todo_wine verify_reg_nonexist(hkey, "Wine70b");
todo_wine verify_reg_nonexist(hkey, "Wine70c");
todo_wine verify_reg_nonexist(hkey, "Wine70d");
todo_wine verify_reg_nonexist(hkey, "Wine70e");
todo_wine verify_reg_nonexist(hkey, "Wine70f");
verify_reg_nonexist(hkey, "Wine70a");
verify_reg_nonexist(hkey, "Wine70b");
verify_reg_nonexist(hkey, "Wine70c");
verify_reg_nonexist(hkey, "Wine70d");
verify_reg_nonexist(hkey, "Wine70e");
verify_reg_nonexist(hkey, "Wine70f");
/* Test forward and back slashes */
test_import_str("REGEDIT4\n\n"
@ -3149,12 +3149,12 @@ static void test_unicode_import(void)
"\"Wine70e\"=\"Value3\\0Value4\"\n"
"\"Wine70f\"=\"\\0Value5\"\n\n", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
todo_wine verify_reg_nonexist(hkey, "Wine70a");
todo_wine verify_reg_nonexist(hkey, "Wine70b");
todo_wine verify_reg_nonexist(hkey, "Wine70c");
todo_wine verify_reg_nonexist(hkey, "Wine70d");
todo_wine verify_reg_nonexist(hkey, "Wine70e");
todo_wine verify_reg_nonexist(hkey, "Wine70f");
verify_reg_nonexist(hkey, "Wine70a");
verify_reg_nonexist(hkey, "Wine70b");
verify_reg_nonexist(hkey, "Wine70c");
verify_reg_nonexist(hkey, "Wine70d");
verify_reg_nonexist(hkey, "Wine70e");
verify_reg_nonexist(hkey, "Wine70f");
/* Test forward and back slashes */
test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"