diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2017-03-28 13:25:27 -0700 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2017-03-28 13:25:27 -0700 |
| commit | c28d9e33054c3052b8be4742711cecd524005a22 (patch) | |
| tree | dc1d2949340a76180f106b88b3caa079b2bb5345 /src/vm/assemblynative.cpp | |
| parent | 90f74b3963073c3671da1b4b95a6c205b7fa0411 (diff) | |
| download | coreclr-c28d9e33054c3052b8be4742711cecd524005a22.tar.gz coreclr-c28d9e33054c3052b8be4742711cecd524005a22.tar.bz2 coreclr-c28d9e33054c3052b8be4742711cecd524005a22.zip | |
return TPA assembly if loadfrom is passed a path to assembly with same identity
Diffstat (limited to 'src/vm/assemblynative.cpp')
| -rw-r--r-- | src/vm/assemblynative.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vm/assemblynative.cpp b/src/vm/assemblynative.cpp index ed5cd7207a..b9079ec06a 100644 --- a/src/vm/assemblynative.cpp +++ b/src/vm/assemblynative.cpp @@ -507,9 +507,12 @@ Assembly* AssemblyNative::LoadFromPEImage(ICLRPrivBinder* pBinderContext, PEImag spec.GetFileOrDisplayName(0, name); COMPlusThrowHR(COR_E_FILELOAD, dwMessageID, name); } + + BINDER_SPACE::Assembly* assem; + assem = BINDER_SPACE::GetAssemblyFromPrivAssemblyFast(pAssembly); - PEAssemblyHolder pPEAssembly(PEAssembly::Open(pParentAssembly, pILImage, pNIImage, pAssembly, FALSE)); - + PEAssemblyHolder pPEAssembly(PEAssembly::Open(pParentAssembly, assem->GetPEImage(), assem->GetNativePEImage(), pAssembly, FALSE)); + GCX_COOP(); IApplicationSecurityDescriptor *pDomainSecDesc = pCurDomain->GetSecurityDescriptor(); |