Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3aed056b
Commit
3aed056b
authored
Oct 19, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix string comparison against non null-terminated string (Valgrind).
parent
595dbe2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
actctx.c
dlls/ntdll/actctx.c
+4
-3
No files found.
dlls/ntdll/actctx.c
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 */
...
...
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