Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
3aed056b
Commit
3aed056b
authored
13 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
ntdll: Fix string comparison against non null-terminated string (Valgrind).
parent
595dbe2e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/ntdll/actctx.c
+4
-3
4 additions, 3 deletions
dlls/ntdll/actctx.c
with
4 additions
and
3 deletions
dlls/ntdll/actctx.c
+
4
−
3
View file @
3aed056b
...
...
@@ -1823,7 +1823,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai )
static
const
WCHAR
lookup_fmtW
[]
=
{
'%'
,
's'
,
'_'
,
'%'
,
's'
,
'_'
,
'%'
,
's'
,
'_'
,
'%'
,
'u'
,
'.'
,
'%'
,
'u'
,
'.'
,
'*'
,
'.'
,
'*'
,
'_'
,
'%'
,
's'
,
'_'
,
'*'
,
'.'
,
'm'
,
'a'
,
'n'
,
'i'
,
'f'
,
'e'
,
's'
,
't'
,
0
};
static
const
WCHAR
wine_trailerW
[]
=
{
'd'
,
'e'
,
'a'
,
'd'
,
'b'
,
'e'
,
'e'
,
'f'
,
'.'
,
'm'
,
'a'
,
'n'
,
'i'
,
'f'
,
'e'
,
's'
,
't'
,
0
};
static
const
WCHAR
wine_trailerW
[]
=
{
'd'
,
'e'
,
'a'
,
'd'
,
'b'
,
'e'
,
'e'
,
'f'
,
'.'
,
'm'
,
'a'
,
'n'
,
'i'
,
'f'
,
'e'
,
's'
,
't'
};
WCHAR
*
lookup
,
*
ret
=
NULL
;
UNICODE_STRING
lookup_us
;
...
...
@@ -1869,7 +1869,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai )
if
(
dir_info
->
NextEntryOffset
)
data_pos
+=
dir_info
->
NextEntryOffset
;
else
data_pos
=
data_len
;
tmp
=
(
WCHAR
*
)
dir_info
->
FileName
+
(
strchrW
(
lookup
,
'*'
)
-
lookup
);
tmp
=
dir_info
->
FileName
+
(
strchrW
(
lookup
,
'*'
)
-
lookup
);
build
=
atoiW
(
tmp
);
if
(
build
<
min_build
)
continue
;
tmp
=
strchrW
(
tmp
,
'.'
)
+
1
;
...
...
@@ -1877,7 +1877,8 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai )
if
(
build
==
min_build
&&
revision
<
min_revision
)
continue
;
tmp
=
strchrW
(
tmp
,
'_'
)
+
1
;
tmp
=
strchrW
(
tmp
,
'_'
)
+
1
;
if
(
!
strcmpiW
(
tmp
,
wine_trailerW
))
if
(
dir_info
->
FileNameLength
-
(
tmp
-
dir_info
->
FileName
)
*
sizeof
(
WCHAR
)
==
sizeof
(
wine_trailerW
)
&&
!
memicmpW
(
tmp
,
wine_trailerW
,
sizeof
(
wine_trailerW
)
/
sizeof
(
WCHAR
)
))
{
/* prefer a non-Wine manifest if we already have one */
/* we'll still load the builtin dll if specified through DllOverrides */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment