regedit: 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>

regedit: Stop parsing REG_SZ values containing NUL character sequences.
b8b7979f · Hugh McMaster · Alexandre Julliard · 87717c9c · b8b7979f · b8b7979f
Commit b8b7979f authored Mar 12, 2021 by Hugh McMaster Committed by Alexandre Julliard Mar 12, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 14 deletions

regproc.c programs/regedit/regproc.c +1 -2

regedit.c programs/regedit/tests/regedit.c +12 -12

No files found.
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -402,8 +402,7 @@ static BOOL REGPROC_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];

--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -1694,12 +1694,12 @@ static void test_invalid_import(void)
                    "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n"
                    "\"Wine33e\"=\"Value3\\0Value4\"\n"
                    "\"Wine33f\"=\"\\0Value5\"\n\n");
-    todo_wine verify_reg_nonexist(hkey, "Wine33a");
-    todo_wine verify_reg_nonexist(hkey, "Wine33b");
-    todo_wine verify_reg_nonexist(hkey, "Wine33c");
-    todo_wine verify_reg_nonexist(hkey, "Wine33d");
-    todo_wine verify_reg_nonexist(hkey, "Wine33e");
-    todo_wine verify_reg_nonexist(hkey, "Wine33f");
+    verify_reg_nonexist(hkey, "Wine33a");
+    verify_reg_nonexist(hkey, "Wine33b");
+    verify_reg_nonexist(hkey, "Wine33c");
+    verify_reg_nonexist(hkey, "Wine33d");
+    verify_reg_nonexist(hkey, "Wine33e");
+    verify_reg_nonexist(hkey, "Wine33f");

    close_key(hkey);

@@ -2205,12 +2205,12 @@ static void test_invalid_import_unicode(void)
                     "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n"
                     "\"Wine33e\"=\"Value3\\0Value4\"\n"
                     "\"Wine33f\"=\"\\0Value5\"\n\n");
-    todo_wine verify_reg_nonexist(hkey, "Wine33a");
-    todo_wine verify_reg_nonexist(hkey, "Wine33b");
-    todo_wine verify_reg_nonexist(hkey, "Wine33c");
-    todo_wine verify_reg_nonexist(hkey, "Wine33d");
-    todo_wine verify_reg_nonexist(hkey, "Wine33e");
-    todo_wine verify_reg_nonexist(hkey, "Wine33f");
+    verify_reg_nonexist(hkey, "Wine33a");
+    verify_reg_nonexist(hkey, "Wine33b");
+    verify_reg_nonexist(hkey, "Wine33c");
+    verify_reg_nonexist(hkey, "Wine33d");
+    verify_reg_nonexist(hkey, "Wine33e");
+    verify_reg_nonexist(hkey, "Wine33f");

    close_key(hkey);