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/binder | |
| 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/binder')
| -rw-r--r-- | src/binder/clrprivbindercoreclr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/binder/clrprivbindercoreclr.cpp b/src/binder/clrprivbindercoreclr.cpp index b7a6807520..d756454edb 100644 --- a/src/binder/clrprivbindercoreclr.cpp +++ b/src/binder/clrprivbindercoreclr.cpp @@ -159,8 +159,8 @@ HRESULT CLRPrivBinderCoreCLR::BindUsingPEImage( /* in */ PEImage *pPEImage, { if (pCoreCLRFoundAssembly->GetIsInGAC()) { - // If we were able to bind to a TPA assembly, then fail the load - IF_FAIL_GO(HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); + *ppAssembly = pCoreCLRFoundAssembly.Extract(); + goto Exit; } } } |