Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
272d35af
Commit
272d35af
authored
Mar 12, 2021
by
Hugh McMaster
Committed by
Alexandre Julliard
Mar 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
b8b7979f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
import.c
programs/reg/import.c
+1
-2
import.c
programs/reg/tests/import.c
+12
-12
No files found.
programs/reg/import.c
View file @
272d35af
...
...
@@ -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
];
...
...
programs/reg/tests/import.c
View file @
272d35af
...
...
@@ -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\xbf
Windows Registry Editor Version 5.00
\n\n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment