Skip to content

W
wine-winehq
Commit b653679e authored by Roman Mindalev's avatar Roman Mindalev Committed by Alexandre Julliard
Browse files
Options

ntdll: Check for arch and name fields in assembly_identity structure.

parent 13f19887
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
dlls/ntdll/actctx.c
View file @ b653679e
...@@ -496,17 +496,19 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) ...@@ -496,17 +496,19 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai)
static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR noneW[] = {'n','o','n','e',0};
static const WCHAR mskeyW[] = {'d','e','a','d','b','e','e','f',0}; static const WCHAR mskeyW[] = {'d','e','a','d','b','e','e','f',0};
const WCHAR *arch = ai->arch ? ai->arch : noneW;
const WCHAR *key = ai->public_key ? ai->public_key : noneW; const WCHAR *key = ai->public_key ? ai->public_key : noneW;
const WCHAR *lang = ai->language ? ai->language : noneW; const WCHAR *lang = ai->language ? ai->language : noneW;
SIZE_T size = (strlenW(ai->arch) + 1 + strlenW(ai->name) + 1 + strlenW(key) + 24 + 1 + const WCHAR *name = ai->name ? ai->name : noneW;
strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); SIZE_T size = (strlenW(arch) + 1 + strlenW(name) + 1 + strlenW(key) + 24 + 1 +
strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW);
WCHAR *ret; WCHAR *ret;
if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL;
strcpyW( ret, ai->arch ); strcpyW( ret, arch );
strcatW( ret, undW ); strcatW( ret, undW );
strcatW( ret, ai->name ); strcatW( ret, name );
strcatW( ret, undW ); strcatW( ret, undW );
strcatW( ret, key ); strcatW( ret, key );
strcatW( ret, undW ); strcatW( ret, undW );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment