From b653679e6a1dfd86ae5b457fb296ebe619e1b8c9 Mon Sep 17 00:00:00 2001 From: Roman Mindalev Date: Fri, 13 Mar 2009 20:14:03 +0300 Subject: [PATCH] ntdll: Check for arch and name fields in assembly_identity structure. --- dlls/ntdll/actctx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 79d475f3321..25c590ab3e9 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -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 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 *lang = ai->language ? ai->language : noneW; - SIZE_T size = (strlenW(ai->arch) + 1 + strlenW(ai->name) + 1 + strlenW(key) + 24 + 1 + - strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); + const WCHAR *name = ai->name ? ai->name : noneW; + SIZE_T size = (strlenW(arch) + 1 + strlenW(name) + 1 + strlenW(key) + 24 + 1 + + strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); WCHAR *ret; if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; - strcpyW( ret, ai->arch ); + strcpyW( ret, arch ); strcatW( ret, undW ); - strcatW( ret, ai->name ); + strcatW( ret, name ); strcatW( ret, undW ); strcatW( ret, key ); strcatW( ret, undW );